* .gnulib: Update to latest, for at least a stdint.h fix
* src/storage/storage_driver.c (storageVolumeZeroSparseFile)
(storageWipeExtent): Use better type, although it still triggers
spurious -Wformat warning on MacOS's gcc.
---
* .gnulib 48b1a1a...6491120 (47):
unistr/u8-strcmp: Avoid collision with libc function on Solaris 11.
Update internal documentation.
Put more information about failed tests into the test return codes.
Update for Solaris 11 2010-11.
nproc: Relax license.
maint: restore executable bit
utimecmp: fine-grained src to nearby coarse-grained dest
strerror_r-posix: Fix autoconf test.
Tests for module 'getdomainname'.
getdomainname: Use the system function when possible.
sys_socket: Ensure ss_family field on AIX.
readline: Improve configure output.
*printf-posix: Detect a bug on Solaris 10/x86.
Fix link error when module libunistring-optional is in use.
regex: Mention link dependencies.
ftoastr: Fix compilation error on Solaris.
Oops, fix typo in last commit.
autoupdate
autoupdate
getloadavg: Update documentation.
sys_socket: Fix test whether the functions are declared.
getpass: Make sure to get system declaration on some platforms.
iconv-h: Fix test-iconv-h-c++ failure on Solaris 11 2010-11.
ftoastr: comment fix
stdint: port to GCC 4.3 + OSX + Octave
doc: Corrections regarding MacOS X 10.4 and 10.5.
autoupdate
Uninstall ".bin" files installed by relocwrapper.
Update for NetBSD 5.0.
Update for HP-UX 11.23 and HP-UX 11.31.
Update for MacOS X 10.5.
bootstrap: add bootstrap_sync option.
Oops, fix incomplete ChangeLog entry.
Ensure that <features.h> is included before __GLIBC__ is tested.
memmem: Fix autoconf test.
Port to uClibc.
nproc: Fix condition.
Fix a comment. * lib/vasnprintf.c (VASNPRINTF): Fix comment.
ftoastr: don't assume snprintf
test-rename.h: fix compilation failure
maint.mk: add a URL discussing the no-@acronym policy
ftoastr: depend on snprintf, improve comments
ftoastr: port to hosts lacking strtof and strtold
c-strtold: Avoid link error on AIX 7.
intprops: new macro INT_BITS_STRLEN_BOUND
ftoastr: new module, for lossless conversion of floats to short strings
autoupdate
.gnulib | 2 +-
src/storage/storage_driver.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gnulib b/.gnulib
index 48b1a1a..6491120 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 48b1a1ae7d5b0f1494aabd4c8a02fbfcec531026
+Subproject commit 64911207854610668b480939469282fdaeb96f74
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 0f099f0..67d043b 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -1575,7 +1575,7 @@ storageVolumeZeroSparseFile(virStorageVolDefPtr vol,
virReportSystemError(errno,
_("Failed to truncate volume with "
"path '%s' to %ju bytes"),
- vol->target.path, (intmax_t)size);
+ vol->target.path, (uintmax_t)size);
}
out:
@@ -1597,13 +1597,13 @@ storageWipeExtent(virStorageVolDefPtr vol,
size_t write_size = 0;
VIR_DEBUG("extent logical start: %ju len: %ju",
- (intmax_t)extent_start, (intmax_t)extent_length);
+ (uintmax_t)extent_start, (uintmax_t)extent_length);
if ((ret = lseek(fd, extent_start, SEEK_SET)) < 0) {
virReportSystemError(errno,
_("Failed to seek to position %ju in volume "
"with path '%s'"),
- (intmax_t)extent_start, vol->target.path);
+ (uintmax_t)extent_start, vol->target.path);
goto out;
}
--
1.7.3.2