From: Guido Günther <agx@sigxcpu.org>
Date: Thu, 26 Nov 2015 17:00:09 +0000 (+0100)
Subject: virtlogd: use %llu to print 64bit types
X-Git-Tag: v1.3.0-rc1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35b2a2d99ae9aa66816d97876111997d9e9d7dec;p=thirdparty%2Flibvirt.git

virtlogd: use %llu to print 64bit types

Otherwise we fail on 32bit with:

CC     logging/virtlogd-log_daemon_dispatch.o
logging/log_daemon_dispatch.c: In function 'virLogManagerProtocolDispatchDomainReadLogFile':
logging/log_daemon_dispatch.c:120:9: error: format '%zu' expects argument of type 'size_t', but argument 7 has type 'uint64_t' [-Werror=format]
---

diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c
index 269255ad5f..160ab00a4b 100644
--- a/src/logging/log_daemon_dispatch.c
+++ b/src/logging/log_daemon_dispatch.c
@@ -118,8 +118,9 @@ virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTRIBUTE_
 
     if (args->maxlen > VIR_LOG_MANAGER_PROTOCOL_STRING_MAX) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Requested data len %zu is larger than maximum %d"),
-                       args->maxlen, VIR_LOG_MANAGER_PROTOCOL_STRING_MAX);
+                       _("Requested data len %llu is larger than maximum %d"),
+                       (unsigned long long)args->maxlen,
+                       VIR_LOG_MANAGER_PROTOCOL_STRING_MAX);
         goto cleanup;
     }
 
diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c
index ed55e6384e..03e9664347 100644
--- a/tests/virrotatingfiletest.c
+++ b/tests/virrotatingfiletest.c
@@ -57,8 +57,9 @@ static int testRotatingFileWriterAssertOneFileSize(const char *filename,
             fprintf(stderr, "File %s should not exist\n", filename);
             return -1;
         } else if (sb.st_size != size) {
-            fprintf(stderr, "File %s should be %zu bytes not %zu\n",
-                    filename, size, sb.st_size);
+            fprintf(stderr, "File %s should be %llu bytes not %llu\n",
+                    filename, (unsigned long long)size,
+                    (unsigned long long)sb.st_size);
             return -1;
         } else {
             return 0;