From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KtLYo-0004c7-F0 for qemu-devel@nongnu.org; Fri, 24 Oct 2008 08:14:34 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KtLYn-0004bs-Ho for qemu-devel@nongnu.org; Fri, 24 Oct 2008 08:14:34 -0400 Received: from [199.232.76.173] (port=45288 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KtLYn-0004bp-Em for qemu-devel@nongnu.org; Fri, 24 Oct 2008 08:14:33 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:18172) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KtLYn-0003ls-3C for qemu-devel@nongnu.org; Fri, 24 Oct 2008 08:14:33 -0400 Message-ID: <4901BC20.3070903@siemens.com> Date: Fri, 24 Oct 2008 14:14:24 +0200 From: Jan Kiszka MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Silence warnings (was: [5441] Add USB sys file-system support (v8) (TJ)) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: linux@tjworld.net Anthony Liguori wrote: > Revision: 5441 > http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5441 > Author: aliguori > Date: 2008-10-07 20:06:37 +0000 (Tue, 07 Oct 2008) > > Log Message: > ----------- > Add USB sys file-system support (v8) (TJ) > > This patch adds support for host USB devices discovered via: > > /sys/bus/usb/devices/* and opened from /dev/bus/usb/*/* > /dev/bus/usb/devices and opened from /dev/bus/usb/*/* > > in addition to the existing discovery via: > > /proc/bus/usb/devices and opened from /proc/bus/usb/*/* And it introduces a few more warnings to the non-debug build... Possible fix below. Signed-off-by: Jan Kiszka --- usb-linux.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: b/usb-linux.c =================================================================== --- a/usb-linux.c +++ b/usb-linux.c @@ -76,6 +76,8 @@ static int usb_host_find_device(int *pbu #define dprintf(...) #endif +#define USBDBG_DEVOPENED "husb: opened %s/devices\n" + #define USBPROCBUS_PATH "/proc/bus/usb" #define PRODUCT_NAME_SZ 32 #define MAX_ENDPOINTS 16 @@ -1262,8 +1264,6 @@ static int usb_host_scan(void *opaque, U FILE *f = 0; DIR *dir = 0; int ret = 0; - const char *devices = "/devices"; - const char *opened = "husb: opened %s%s\n"; const char *fs_type[] = {"unknown", "proc", "dev", "sys"}; char devpath[PATH_MAX]; @@ -1275,7 +1275,7 @@ static int usb_host_scan(void *opaque, U strcpy(devpath, USBPROCBUS_PATH); usb_fs_type = USB_FS_PROC; fclose(f); - dprintf(opened, USBPROCBUS_PATH, devices); + dprintf(USBDBG_DEVOPENED, USBPROCBUS_PATH); goto found_devices; } /* try additional methods if an access method hasn't been found yet */ @@ -1285,7 +1285,7 @@ static int usb_host_scan(void *opaque, U strcpy(devpath, USBDEVBUS_PATH); usb_fs_type = USB_FS_DEV; fclose(f); - dprintf(opened, USBDEVBUS_PATH, devices); + dprintf(USBDBG_DEVOPENED, USBDEVBUS_PATH); goto found_devices; } dir = opendir(USBSYSBUS_PATH "/devices"); @@ -1294,7 +1294,7 @@ static int usb_host_scan(void *opaque, U strcpy(devpath, USBDEVBUS_PATH); usb_fs_type = USB_FS_SYS; closedir(dir); - dprintf(opened, USBSYSBUS_PATH, devices); + dprintf(USBDBG_DEVOPENED, USBSYSBUS_PATH); goto found_devices; } found_devices: