Imported Upstream version 2.7.1

This commit is contained in:
Laurent Bigonville 2013-11-24 16:00:12 +01:00
parent a1fa151fc7
commit 0121794af9
451 changed files with 41339 additions and 10887 deletions

View file

@ -177,7 +177,7 @@ nutscan_device_t * nutscan_scan_usb()
dev->descriptor.iSerialNumber,
string, sizeof(string));
if (ret > 0) {
serialnumber = strdup(string);
serialnumber = strdup(rtrim(string, ' '));
}
}
/* get product name */
@ -186,7 +186,7 @@ nutscan_device_t * nutscan_scan_usb()
dev->descriptor.iProduct,
string, sizeof(string));
if (ret > 0) {
device_name = strdup(string);
device_name = strdup(rtrim(string, ' '));
}
}
@ -196,7 +196,7 @@ nutscan_device_t * nutscan_scan_usb()
dev->descriptor.iManufacturer,
string, sizeof(string));
if (ret > 0) {
vendor_name = strdup(string);
vendor_name = strdup(rtrim(string, ' '));
}
}
@ -255,7 +255,7 @@ nutscan_device_t * nutscan_scan_usb()
}
}
return current_nut_dev;
return nutscan_rewind_device(current_nut_dev);
}
#else /* WITH_USB */
nutscan_device_t * nutscan_scan_usb()