From 00766a4ec9dd748dab308f6a2b00f02e964d9951 Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Wed, 14 Jan 2009 18:08:08 +0000 Subject: Make OpenBSD sparc-softmmu compile warning free git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6299 c046a42c-6fe2-441c-8c8c-71466251a162 --- usb-bsd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'usb-bsd.c') diff --git a/usb-bsd.c b/usb-bsd.c index 0e4157c58..a8a805f06 100644 --- a/usb-bsd.c +++ b/usb-bsd.c @@ -178,7 +178,7 @@ static int usb_host_handle_control(USBDevice *dev, req.ucr_flags = USBD_SHORT_XFER_OK; ret = ioctl(s->devfd, USB_SET_TIMEOUT, &timeout); -#if (__NetBSD__ || __OpenBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) if (ret < 0 && errno != EINVAL) { #else if (ret < 0) { @@ -372,7 +372,7 @@ USBDevice *usb_host_device_open(const char *devname) "host:%s", devname); pstrcpy(dev->devpath, sizeof(dev->devpath), "/dev/"); - strcat(dev->devpath, dev_info.udi_devnames[0]); + pstrcat(dev->devpath, sizeof(dev->devpath), dev_info.udi_devnames[0]); /* Mark the endpoints as not yet open */ for (i = 0; i < USB_MAX_ENDPOINTS; i++) @@ -550,10 +550,10 @@ static const char *usb_class_str(uint8_t class) return p->class_name; } -void usb_info_device(int bus_num, int addr, int class_id, - int vendor_id, int product_id, - const char *product_name, - int speed) +static void usb_info_device(int bus_num, int addr, int class_id, + int vendor_id, int product_id, + const char *product_name, + int speed) { const char *class_str, *speed_str; -- cgit v1.2.3