[libvirt] [PATCH] virtlogd: use PRIu64 to print 64bit types

Guido Günther agx at sigxcpu.org
Thu Nov 26 17:46:13 UTC 2015


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]
---
 src/logging/log_daemon_dispatch.c | 3 ++-
 tests/virrotatingfiletest.c       | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c
index 269255a..7391a6f 100644
--- a/src/logging/log_daemon_dispatch.c
+++ b/src/logging/log_daemon_dispatch.c
@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <inttypes.h>
 
 #include "rpc/virnetserver.h"
 #include "rpc/virnetserverclient.h"
@@ -118,7 +119,7 @@ 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"),
+                       _("Requested data len %"PRIu64" is larger than maximum %d"),
                        args->maxlen, VIR_LOG_MANAGER_PROTOCOL_STRING_MAX);
         goto cleanup;
     }
diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c
index ed55e63..73f0c26 100644
--- a/tests/virrotatingfiletest.c
+++ b/tests/virrotatingfiletest.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <inttypes.h>
 
 #include "virrotatingfile.h"
 #include "virlog.h"
@@ -57,7 +58,8 @@ 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",
+            fprintf(stderr, "File %s should be %" PRIu64
+                    " bytes not %" PRIu64 "\n",
                     filename, size, sb.st_size);
             return -1;
         } else {
-- 
2.6.2




More information about the libvir-list mailing list