External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtlogd: use %llu to print 64bit types

Browse Source 
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]
This commit is contained in:
Guido Günther 2015-11-26 18:00:09 +01:00
parent c32d977e0f
commit 35b2a2d99a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/logging/log_daemon_dispatch.c
View File

@ -118,8 +118,9 @@ virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTRIBUTE_
if (args->maxlen > VIR_LOG_MANAGER_PROTOCOL_STRING_MAX) { if (args->maxlen > VIR_LOG_MANAGER_PROTOCOL_STRING_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Requested data len %zu is larger than maximum %d"), _("Requested data len %llu is larger than maximum %d"),
args->maxlen, VIR_LOG_MANAGER_PROTOCOL_STRING_MAX); (unsigned long long)args->maxlen,
VIR_LOG_MANAGER_PROTOCOL_STRING_MAX);
goto cleanup; goto cleanup;
} }

5
tests/virrotatingfiletest.c
View File

@ -57,8 +57,9 @@ static int testRotatingFileWriterAssertOneFileSize(const char *filename,
fprintf(stderr, "File %s should not exist\n", filename); fprintf(stderr, "File %s should not exist\n", filename);
return -1; return -1;
} else if (sb.st_size != size) { } else if (sb.st_size != size) {
fprintf(stderr, "File %s should be %zu bytes not %zu\n", fprintf(stderr, "File %s should be %llu bytes not %llu\n",
filename, size, sb.st_size); filename, (unsigned long long)size,
(unsigned long long)sb.st_size);
return -1; return -1;
} else { } else {
return 0; return 0;