From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L8ev3-0002wm-Q9 for qemu-devel@nongnu.org; Fri, 05 Dec 2008 12:56:49 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L8ev3-0002wN-9p for qemu-devel@nongnu.org; Fri, 05 Dec 2008 12:56:49 -0500 Received: from [199.232.76.173] (port=37406 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L8ev2-0002wD-PX for qemu-devel@nongnu.org; Fri, 05 Dec 2008 12:56:48 -0500 Received: from savannah.gnu.org ([199.232.41.3]:39631 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L8ev1-0001fY-4c for qemu-devel@nongnu.org; Fri, 05 Dec 2008 12:56:48 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L8euv-0007J1-Co for qemu-devel@nongnu.org; Fri, 05 Dec 2008 17:56:41 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L8euv-0007Iv-5K for qemu-devel@nongnu.org; Fri, 05 Dec 2008 17:56:41 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Fri, 05 Dec 2008 17:56:41 +0000 Subject: [Qemu-devel] [5888] Attached patch contains warning fixes. 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 Revision: 5888 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5888 Author: blueswir1 Date: 2008-12-05 17:56:40 +0000 (Fri, 05 Dec 2008) Log Message: ----------- Attached patch contains warning fixes. Signed-off-by: Christoph Egger Modified Paths: -------------- trunk/block.c trunk/hw/mpcore.c trunk/usb-bsd.c Modified: trunk/block.c =================================================================== --- trunk/block.c 2008-12-05 17:55:45 UTC (rev 5887) +++ trunk/block.c 2008-12-05 17:56:40 UTC (rev 5888) @@ -765,7 +765,7 @@ int ret, i, heads, sectors, cylinders; struct partition *p; uint32_t nr_sects; - int64_t nb_sectors; + uint64_t nb_sectors; bdrv_get_geometry(bs, &nb_sectors); @@ -805,7 +805,7 @@ { int translation, lba_detected = 0; int cylinders, heads, secs; - int64_t nb_sectors; + uint64_t nb_sectors; /* if a geometry hint is available, use it */ bdrv_get_geometry(bs, &nb_sectors); Modified: trunk/hw/mpcore.c =================================================================== --- trunk/hw/mpcore.c 2008-12-05 17:55:45 UTC (rev 5887) +++ trunk/hw/mpcore.c 2008-12-05 17:56:40 UTC (rev 5888) @@ -105,6 +105,8 @@ return s->control; case 12: /* Interrupt status. */ return s->status; + default: + return 0; } } Modified: trunk/usb-bsd.c =================================================================== --- trunk/usb-bsd.c 2008-12-05 17:55:45 UTC (rev 5887) +++ trunk/usb-bsd.c 2008-12-05 17:56:40 UTC (rev 5888) @@ -68,7 +68,7 @@ ep = UE_GET_ADDR(ep); if (dev->ep_fd[ep] < 0) { -#if __FreeBSD__ +#ifdef __FreeBSD__ snprintf(buf, sizeof(buf) - 1, "%s.%d", dev->devpath, ep); #else snprintf(buf, sizeof(buf) - 1, "%s.%02d", dev->devpath, ep); @@ -321,7 +321,7 @@ return NULL; } -#if __FreeBSD__ +#ifdef __FreeBSD__ snprintf(ctlpath, PATH_MAX, "/dev/%s", bus_info.udi_devnames[0]); #else snprintf(ctlpath, PATH_MAX, "/dev/%s.00", bus_info.udi_devnames[0]); @@ -413,7 +413,7 @@ if (strncmp(bus_info.udi_devnames[0], "ugen", 4) != 0) continue; -#if __FreeBSD__ +#ifdef __FreeBSD__ snprintf(devbuf, sizeof(devbuf) - 1, "/dev/%s", bus_info.udi_devnames[0]); #else snprintf(devbuf, sizeof(devbuf) - 1, "/dev/%s.00", bus_info.udi_devnames[0]);