From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FqXdC-0002pA-AB for qemu-devel@nongnu.org; Wed, 14 Jun 2006 11:50:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FqXdB-0002nS-An for qemu-devel@nongnu.org; Wed, 14 Jun 2006 11:50:10 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FqXdB-0002nC-6f for qemu-devel@nongnu.org; Wed, 14 Jun 2006 11:50:09 -0400 Received: from [199.232.41.3] (helo=savannah.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.52) id 1FqXmN-00004z-KE for qemu-devel@nongnu.org; Wed, 14 Jun 2006 11:59:39 -0400 Received: from savannah.gnu.org ([127.0.0.1]) by savannah.gnu.org with esmtp (Exim 3.36 #1 (Debian)) id 1FqXd9-0003hs-00 for ; Wed, 14 Jun 2006 11:50:07 -0400 Received: from bellard by savannah.gnu.org with local (Exim 4.50) id 1FqXd9-0003hn-EU for qemu-devel@nongnu.org; Wed, 14 Jun 2006 15:50:07 +0000 Message-Id: From: Fabrice Bellard Date: Wed, 14 Jun 2006 15:50:07 +0000 Subject: [Qemu-devel] qemu vl.h qemu-img.c 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 CVSROOT: /sources/qemu Module name: qemu Changes by: Fabrice Bellard 06/06/14 15:50:07 Modified files: . : vl.h qemu-img.c Log message: use C99 64 bit printf format to ease win32 porting CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemu&r1=1.126&r2=1.127 http://cvs.savannah.gnu.org/viewcvs/qemu/qemu-img.c?cvsroot=qemu&r1=1.9&r2=1.10 Patches: Index: vl.h =================================================================== RCS file: /sources/qemu/qemu/vl.h,v retrieving revision 1.126 retrieving revision 1.127 diff -u -b -r1.126 -r1.127 --- vl.h 13 Jun 2006 15:57:21 -0000 1.126 +++ vl.h 14 Jun 2006 15:50:07 -0000 1.127 @@ -58,6 +58,8 @@ _fullpath(resolved_path, path, _MAX_PATH); return resolved_path; } + +#define PRId64 "I64d" #endif #ifdef QEMU_TOOL Index: qemu-img.c =================================================================== RCS file: /sources/qemu/qemu/qemu-img.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- qemu-img.c 14 Jun 2006 15:32:10 -0000 1.9 +++ qemu-img.c 14 Jun 2006 15:50:07 -0000 1.10 @@ -164,12 +164,12 @@ static void get_human_readable_size(char *buf, int buf_size, int64_t size) { - char suffixes[NB_SUFFIXES] = "KMGT"; + static const char suffixes[NB_SUFFIXES] = "KMGT"; int64_t base; int i; if (size <= 999) { - snprintf(buf, buf_size, "%lld", (long long) size); + snprintf(buf, buf_size, "%" PRId64, size); } else { base = 1024; for(i = 0; i < NB_SUFFIXES; i++) { @@ -179,8 +179,8 @@ suffixes[i]); break; } else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) { - snprintf(buf, buf_size, "%lld%c", - (long long) ((size + (base >> 1)) / base), + snprintf(buf, buf_size, "%" PRId64 "%c", + ((size + (base >> 1)) / base), suffixes[i]); break; } @@ -373,7 +373,7 @@ printf(", backing_file=%s", base_filename); } - printf(", size=%lld kB\n", (long long) (size / 1024)); + printf(", size=%" PRId64 " kB\n", (int64_t) (size / 1024)); ret = bdrv_create(drv, filename, size / 512, base_filename, encrypted); if (ret < 0) { if (ret == -ENOTSUP) { @@ -563,7 +563,8 @@ memset(buf + n * 512, 0, cluster_size - n * 512); if (is_not_zero(buf, cluster_size)) { if (qcow_compress_cluster(out_bs, sector_num, buf) != 0) - error("error while compressing sector %lld", sector_num); + error("error while compressing sector %" PRId64, + sector_num); } sector_num += n; } @@ -680,10 +681,10 @@ allocated_size); printf("image: %s\n" "file format: %s\n" - "virtual size: %s (%lld bytes)\n" + "virtual size: %s (%" PRId64 " bytes)\n" "disk size: %s\n", filename, fmt_name, size_buf, - (long long) (total_sectors * 512), + (total_sectors * 512), dsize_buf); if (bdrv_is_encrypted(bs)) printf("encrypted: yes\n");