valentineus/0xFFFF
1
Fork 0
Code Releases Activity

nolo: Fixed nolo_get_string

Browse Source
This commit is contained in:
Pali Rohár committed 2012-09-23 13:59:31 +02:00
1 parent b2bd1d90c7
commit d9e6d47f1b
1 file changed
+4 -1
Download Patch File Download Diff File Expand all files Collapse all files
src/nolo.c
+4 -1
View File
@@ -121,13 +121,16 @@ static int nolo_set_string(struct usb_device_info * dev, char * str, char * arg)
static int nolo_get_string(struct usb_device_info * dev, char * str, char * out, size_t size) { static int nolo_get_string(struct usb_device_info * dev, char * str, char * out, size_t size) {
int ret;
if ( usb_control_msg(dev->udev, NOLO_WRITE, NOLO_STRING, 0, 0, str, strlen(str), 2000) < 0 ) if ( usb_control_msg(dev->udev, NOLO_WRITE, NOLO_STRING, 0, 0, str, strlen(str), 2000) < 0 )
ERROR_RETURN("NOLO_STRING failed", -1); ERROR_RETURN("NOLO_STRING failed", -1);
if ( usb_control_msg(dev->udev, NOLO_QUERY, NOLO_GET_STRING, 0, 0, out, size, 2000) < 0 ) if ( ( ret = usb_control_msg(dev->udev, NOLO_QUERY, NOLO_GET_STRING, 0, 0, out, size-1, 2000) ) < 0 )
ERROR_RETURN("NOLO_GET_STRING failed", -1); ERROR_RETURN("NOLO_GET_STRING failed", -1);
out[size-1] = 0; out[size-1] = 0;
out[ret] = 0;
return strlen(out); return strlen(out);
} }