CVSROOT: /sources/qemu
Module name: qemu
Changes by: Fabrice Bellard <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");
_______________________________________________
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel
