mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppress a -Werror=format-security warning

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6135 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-12-28 15:45:20 +00:00
parent 60cbfb9552
commit b4e237aae7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usb-linux.c
View File

@ -1163,7 +1163,8 @@ static int usb_host_read_file(char *line, size_t line_size, const char *device_f
int ret = 0; int ret = 0;
char filename[PATH_MAX]; char filename[PATH_MAX];
snprintf(filename, PATH_MAX, device_file, device_name); snprintf(filename, PATH_MAX, USBSYSBUS_PATH "/devices/%s/%s", device_name,
device_file);
f = fopen(filename, "r"); f = fopen(filename, "r");
if (f) { if (f) {
fgets(line, line_size, f); fgets(line, line_size, f);
@ -1205,27 +1206,30 @@ static int usb_host_scan_sys(void *opaque, USBScanFunc *func)
tmpstr += 3; tmpstr += 3;
bus_num = atoi(tmpstr); bus_num = atoi(tmpstr);
if (!usb_host_read_file(line, sizeof(line), USBSYSBUS_PATH "/devices/%s/devnum", de->d_name)) if (!usb_host_read_file(line, sizeof(line), "devnum", de->d_name))
goto the_end; goto the_end;
if (sscanf(line, "%d", &addr) != 1) if (sscanf(line, "%d", &addr) != 1)
goto the_end; goto the_end;
if (!usb_host_read_file(line, sizeof(line), USBSYSBUS_PATH "/devices/%s/bDeviceClass", de->d_name)) if (!usb_host_read_file(line, sizeof(line), "bDeviceClass",
de->d_name))
goto the_end; goto the_end;
if (sscanf(line, "%x", &class_id) != 1) if (sscanf(line, "%x", &class_id) != 1)
goto the_end; goto the_end;
if (!usb_host_read_file(line, sizeof(line), USBSYSBUS_PATH "/devices/%s/idVendor", de->d_name)) if (!usb_host_read_file(line, sizeof(line), "idVendor", de->d_name))
goto the_end; goto the_end;
if (sscanf(line, "%x", &vendor_id) != 1) if (sscanf(line, "%x", &vendor_id) != 1)
goto the_end; goto the_end;
if (!usb_host_read_file(line, sizeof(line), USBSYSBUS_PATH "/devices/%s/idProduct", de->d_name)) if (!usb_host_read_file(line, sizeof(line), "idProduct",
de->d_name))
goto the_end; goto the_end;
if (sscanf(line, "%x", &product_id) != 1) if (sscanf(line, "%x", &product_id) != 1)
goto the_end; goto the_end;
if (!usb_host_read_file(line, sizeof(line), USBSYSBUS_PATH "/devices/%s/product", de->d_name)) { if (!usb_host_read_file(line, sizeof(line), "product",
de->d_name)) {
*product_name = 0; *product_name = 0;
} else { } else {
if (strlen(line) > 0) if (strlen(line) > 0)
@ -1233,7 +1237,7 @@ static int usb_host_scan_sys(void *opaque, USBScanFunc *func)
pstrcpy(product_name, sizeof(product_name), line); pstrcpy(product_name, sizeof(product_name), line);
} }
if (!usb_host_read_file(line, sizeof(line), USBSYSBUS_PATH "/devices/%s/speed", de->d_name)) if (!usb_host_read_file(line, sizeof(line), "speed", de->d_name))
goto the_end; goto the_end;
if (!strcmp(line, "480\n")) if (!strcmp(line, "480\n"))
speed = USB_SPEED_HIGH; speed = USB_SPEED_HIGH;