From: Eric Blake <eblake@redhat.com>
Date: Wed, 8 Dec 2010 00:31:14 +0000 (-0700)
Subject: maint: update to latest gnulib
X-Git-Tag: v0.8.7~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f636752b157d4b476209455ed3a8f5c006196ff;p=thirdparty%2Flibvirt.git

maint: update to latest gnulib

* .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.
---

diff --git a/.gnulib b/.gnulib
index 48b1a1ae7d..6491120785 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 0f099f0124..67d043bc8f 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;
     }