From 339cc9d9927868ed20229adc12a9224fd63fcd83 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 27 Jan 2009 08:50:03 +0000
Subject: [PATCH] build: avoid format warnings

* src/proxy_internal.c (xenProxyCommand): Mark a diagnostic.
* src/xen_unified.c (xenUnifiedOpen, xenUnifiedAddDomainInfo):
Fix unmarked diagnostics by removing the diagnostic altogether:
replace each xenUnifiedError(...,VIR_ERR_NO_MEMORY call with a
call to virReportOOMError.
---
 ChangeLog            |  9 +++++++++
 src/proxy_internal.c |  6 ++----
 src/xen_unified.c    | 10 +++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b32e63ba9..38c700a78f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan 26 20:40:35 +0100 2009 Jim Meyering <meyering@redhat.com>
+
+	build: avoid format warnings
+	* src/proxy_internal.c (xenProxyCommand): Mark a diagnostic.
+	* src/xen_unified.c (xenUnifiedOpen, xenUnifiedAddDomainInfo):
+	Fix unmarked diagnostics by removing the diagnostic altogether:
+	replace each xenUnifiedError(...,VIR_ERR_NO_MEMORY call with a
+	call to virReportOOMError.
+
 Mon Jan 26 14:44:22 +0100 2009 Jim Meyering <meyering@redhat.com>
 
 	* src/virterror.c (virErrorMsg): Correct indentation.
diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index 4d8be3ae2d..d1255aece4 100644
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -1,7 +1,7 @@
 /*
  * proxy_client.c: client side of the communication with the libvirt proxy.
  *
- * Copyright (C) 2006, 2008 Red Hat, Inc.
+ * Copyright (C) 2006, 2008, 2009 Red Hat, Inc.
  *
  * See COPYING.LIB for the License of this software
  *
@@ -455,7 +455,7 @@ retry:
      */
     if ((res == NULL) || (res->version != PROXY_PROTO_VERSION) ||
         (res->len < sizeof(virProxyPacket))) {
-        virProxyError(conn, VIR_ERR_INTERNAL_ERROR,
+        virProxyError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
                       _("Communication error with proxy: malformed packet\n"));
         goto error;
     }
@@ -1058,5 +1058,3 @@ xenProxyDomainGetOSType(virDomainPtr domain)
 
     return(ostype);
 }
-
-
diff --git a/src/xen_unified.c b/src/xen_unified.c
index 1a0f007632..e70c8acd78 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -236,7 +236,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags)
 
         conn->uri = xmlParseURI("xen:///");
         if (!conn->uri) {
-            xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, NULL);
+            virReportOOMError (NULL);
             return VIR_DRV_OPEN_ERROR;
         }
     }
@@ -261,19 +261,19 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags)
 
     /* Allocate per-connection private data. */
     if (VIR_ALLOC(priv) < 0) {
-        xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, _("allocating private data"));
+        virReportOOMError (NULL);
         return VIR_DRV_OPEN_ERROR;
     }
     if (virMutexInit(&priv->lock) < 0) {
         xenUnifiedError (NULL, VIR_ERR_INTERNAL_ERROR,
-                         _("cannot initialise mutex"));
+                         "%s", _("cannot initialise mutex"));
         VIR_FREE(priv);
         return VIR_DRV_OPEN_ERROR;
     }
 
     /* Allocate callback list */
     if (VIR_ALLOC(cbList) < 0) {
-        xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, _("allocating callback list"));
+        virReportOOMError (NULL);
         virMutexDestroy(&priv->lock);
         VIR_FREE(priv);
         return VIR_DRV_OPEN_ERROR;
@@ -1564,7 +1564,7 @@ xenUnifiedAddDomainInfo(xenUnifiedDomainInfoListPtr list,
     list->count++;
     return 0;
 memory_error:
-    xenUnifiedError (NULL, VIR_ERR_NO_MEMORY, _("allocating domain info"));
+    virReportOOMError (NULL);
     if (info)
         VIR_FREE(info->name);
     VIR_FREE(info);