From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LnjsV-0007mv-7c
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 21:31:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LnjsU-0007m2-2j
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 21:31:58 -0400
Received: from [199.232.76.173] (port=34373 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LnjsT-0007lu-SE
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 21:31:57 -0400
Received: from savannah.gnu.org ([199.232.41.3]:39020 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 <anthony@codemonkey.ws>)
	id 1LnjsT-00042K-IY
	for qemu-devel@nongnu.org; Sat, 28 Mar 2009 21:31:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1LnjsS-0000nS-VM
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 01:31:57 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LnjsS-0000nM-GI
	for qemu-devel@nongnu.org; Sun, 29 Mar 2009 01:31:56 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LnjsS-0000nM-GI@cvs.savannah.gnu.org>
Date: Sun, 29 Mar 2009 01:31:56 +0000
Subject: [Qemu-devel] [6944] fix format string warnings in block-qcow2.c
	(Christoph Hellwig)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6944
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6944
Author:   aliguori
Date:     2009-03-29 01:31:56 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
fix format string warnings in block-qcow2.c (Christoph Hellwig)

Recent patches added two compiler warnings about the format string
usage in qcow_read_extensions.  One is printing a uint64_t using
%lu which is incorrect on many platforms as it can be a unsigned
long long, the second one is printing the result of sizeof as
%lu, but it is a size_t so it needs to be printed using %zu.


Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/block-qcow2.c

Modified: trunk/block-qcow2.c
===================================================================
--- trunk/block-qcow2.c	2009-03-29 01:31:51 UTC (rev 6943)
+++ trunk/block-qcow2.c	2009-03-29 01:31:56 UTC (rev 6944)
@@ -223,8 +223,8 @@
 #endif
 
         if (bdrv_pread(s->hd, offset, &ext, sizeof(ext)) != sizeof(ext)) {
-            fprintf(stderr, "qcow_handle_extension: ERROR: pread fail from offset %lu\n",
-                    offset);
+            fprintf(stderr, "qcow_handle_extension: ERROR: pread fail from offset %llu\n",
+                    (unsigned long long)offset);
             return 1;
         }
         be32_to_cpus(&ext.magic);
@@ -240,7 +240,7 @@
         case QCOW_EXT_MAGIC_BACKING_FORMAT:
             if (ext.len >= sizeof(bs->backing_format)) {
                 fprintf(stderr, "ERROR: ext_backing_format: len=%u too large"
-                        " (>=%lu)\n",
+                        " (>=%zu)\n",
                         ext.len, sizeof(bs->backing_format));
                 return 2;
             }