ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use C99 64 bit printf format to ease win32 porting 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1974 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2006-06-14 15:50:07 +00:00
parent e8445331b6
commit ec3757de32
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qemu-img.c
View File

@ -164,12 +164,12 @@ void help(void)
static void get_human_readable_size(char *buf, int buf_size, int64_t size) 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; int64_t base;
int i; int i;
if (size <= 999) { if (size <= 999) {
snprintf(buf, buf_size, "%lld", (long long) size); snprintf(buf, buf_size, "%" PRId64, size);
} else { } else {
base = 1024; base = 1024;
for(i = 0; i < NB_SUFFIXES; i++) { for(i = 0; i < NB_SUFFIXES; i++) {
@ -179,8 +179,8 @@ static void get_human_readable_size(char *buf, int buf_size, int64_t size)
suffixes[i]); suffixes[i]);
break; break;
} else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) { } else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) {
snprintf(buf, buf_size, "%lld%c", snprintf(buf, buf_size, "%" PRId64 "%c",
(long long) ((size + (base >> 1)) / base), ((size + (base >> 1)) / base),
suffixes[i]); suffixes[i]);
break; break;
} }
@ -373,7 +373,7 @@ static int img_create(int argc, char **argv)
printf(", backing_file=%s", printf(", backing_file=%s",
base_filename); 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); ret = bdrv_create(drv, filename, size / 512, base_filename, encrypted);
if (ret < 0) { if (ret < 0) {
if (ret == -ENOTSUP) { if (ret == -ENOTSUP) {
@ -563,7 +563,8 @@ static int img_convert(int argc, char **argv)
memset(buf + n * 512, 0, cluster_size - n * 512); memset(buf + n * 512, 0, cluster_size - n * 512);
if (is_not_zero(buf, cluster_size)) { if (is_not_zero(buf, cluster_size)) {
if (qcow_compress_cluster(out_bs, sector_num, buf) != 0) 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; sector_num += n;
} }
@ -680,10 +681,10 @@ static int img_info(int argc, char **argv)
allocated_size); allocated_size);
printf("image: %s\n" printf("image: %s\n"
"file format: %s\n" "file format: %s\n"
"virtual size: %s (%lld bytes)\n" "virtual size: %s (%" PRId64 " bytes)\n"
"disk size: %s\n", "disk size: %s\n",
filename, fmt_name, size_buf, filename, fmt_name, size_buf,
(long long) (total_sectors * 512), (total_sectors * 512),
dsize_buf); dsize_buf);
if (bdrv_is_encrypted(bs)) if (bdrv_is_encrypted(bs))
printf("encrypted: yes\n"); printf("encrypted: yes\n");

2
vl.h
View File

@ -58,6 +58,8 @@ static inline char *realpath(const char *path, char *resolved_path)
_fullpath(resolved_path, path, _MAX_PATH); _fullpath(resolved_path, path, _MAX_PATH);
return resolved_path; return resolved_path;
} }
#define PRId64 "I64d"
#endif #endif
#ifdef QEMU_TOOL #ifdef QEMU_TOOL