Fix two format string warnings on 32bit hosts

diff --git a/ChangeLog b/ChangeLog
index 68515d6cd6d952187f00e0f49cec64897c2f8fac..c30b530b8dd4129d427b3ee7d8f0eb29d2d6be50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 10 13:30:00 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/xml.c, src/xen_internal.c: Cast some args to unsigned
+       long to avoid printf format specifier warnings on 32-bit
+
 Fri Oct 10 12:30:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
 
        Updated MinGW spec file.

diff --git a/src/xen_internal.c b/src/xen_internal.c
index bdf8f8fa087a00dab2e458673cfafe45240454d7..023222fb32eec57ab3977ce579fc6a0699538ceb 100644 (file)
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -1927,7 +1927,8 @@ xenHypervisorInit(void)
      */
 
     hypervisor_version = -1;
-    virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu", IOCTL_PRIVCMD_HYPERCALL);
+    virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu",
+                (unsigned long) IOCTL_PRIVCMD_HYPERCALL);
     close(fd);
     in_init = 0;
     return(-1);
@@ -2004,7 +2005,8 @@ xenHypervisorInit(void)
 
     DEBUG0("Failed to find any Xen hypervisor method\n");
     hypervisor_version = -1;
-    virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu", IOCTL_PRIVCMD_HYPERCALL);
+    virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu",
+                (unsigned long)IOCTL_PRIVCMD_HYPERCALL);
     close(fd);
     in_init = 0;
     VIR_FREE(ipt);

diff --git a/src/xml.c b/src/xml.c
index 6e6e0f6ce9fdd8149956691e664ba54cd296dc0f..3536216b8d19c79050fc8b9b38483227cdd14d30 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -351,7 +351,7 @@ virXPathNodeSet(virConnectPtr conn,
         if (VIR_ALLOC_N(*list, ret) < 0) {
             virXMLError(conn, VIR_ERR_NO_MEMORY,
                         _("allocate string array size %lu"),
-                        ret * sizeof(**list));
+                        (unsigned long)ret * sizeof(**list));
             ret = -1;
         } else {
             memcpy(*list, obj->nodesetval->nodeTab,