diff options
| author | Eric Blake <eblake@redhat.com> | 2019-01-08 13:46:48 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-01-08 14:46:35 -0600 |
| commit | 358b6b593ec7e5afbb785be25c8525538f350850 (patch) | |
| tree | 56d92874937bff3eb60faf13cc096c2bd145c50c /examples | |
| parent | 4abd8d01cdd8b0becdb8b37e899b10586d58610f (diff) | |
| download | libvirt-358b6b593ec7e5afbb785be25c8525538f350850.tar.gz | |
examples: Work around mingw printf() weakness
mingw lacks %lld and %zu support in printf(); we were getting it
from gnulib. But since commit acf522e8 stopped linking examples
against gnulib, we are getting a build failure due to -Wformat
flagging these strings. Keep the examples standalone, and work
around mingw by using manual casts to types we can portably print.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/domtop/domtop.c | 3 | ||||
| -rw-r--r-- | examples/object-events/event-test.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index 4224e4c9ec..ada5a064fb 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -241,7 +241,8 @@ print_cpu_usage(const char *dom_name, if (delim) printf("\t"); - printf("CPU%zu: %.2lf", cpu + i, usage); + /* mingw lacks %zu */ + printf("CPU%u: %.2lf", (unsigned)(cpu + i), usage); delim = true; } diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 53d95b10d0..0c99fb33e3 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -948,10 +948,11 @@ myDomainEventBlockThresholdCallback(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long long excess, void *opaque ATTRIBUTE_UNUSED) { + /* Casts to uint64_t to work around mingw not knowing %lld */ printf("%s EVENT: Domain %s(%d) block threshold callback dev '%s'(%s), " - "threshold: '%llu', excess: '%llu'", + "threshold: '%" PRIu64 "', excess: '%" PRIu64 "'", __func__, virDomainGetName(dom), virDomainGetID(dom), - dev, NULLSTR(path), threshold, excess); + dev, NULLSTR(path), (uint64_t)threshold, (uint64_t)excess); return 0; } |