From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 3 May 2014 19:46:52 +0000 (-0400)
Subject: virdbus: Remove redundant error macro
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=aa7fc495c09cd1d279d335284cbeaf4c9182afad;p=libvirt.git

virdbus: Remove redundant error macro

This is the only callsite.

We drop use of localerror.name here, because it's not actually useful
to us: rather than the parameter name which received an invalid value
(which was assumed), it's actually the the dbus errno equivalent.
Just use the error string.

Acked-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 709d6ee463..03ec028dc9 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -1423,9 +1423,10 @@ virDBusCall(DBusConnection *conn,
                                                             error ? error : &localerror))) {
         if (error)
             ret = 0;
-        else
-            virReportDBusServiceError(localerror.message ? localerror.message : "unknown error",
-                                      localerror.name);
+        else {
+            virReportError(VIR_ERR_DBUS_SERVICE, "%s",
+                localerror.message ? localerror.message : _("unknown error"));
+        }
         goto cleanup;
     }
 
diff --git a/src/util/virerror.h b/src/util/virerror.h
index fe0e15efe8..5c8578f791 100644
--- a/src/util/virerror.h
+++ b/src/util/virerror.h
@@ -145,17 +145,6 @@ void virReportSystemErrorFull(int domcode,
                       0, 0,                                          \
                       (fmt), __VA_ARGS__)
 
-# define virReportDBusServiceError(message, name)                    \
-    virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__,              \
-                      VIR_FROM_THIS,                                 \
-                      VIR_ERR_DBUS_SERVICE,                          \
-                      VIR_ERR_ERROR,                                 \
-                      __FUNCTION__,                                  \
-                      name,                                          \
-                      NULL,                                          \
-                      0, 0,                                          \
-                      "%s", message);
-
 # define virReportUnsupportedError()                                    \
     virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_NO_SUPPORT,             \
                          __FILE__, __FUNCTION__, __LINE__, __FUNCTION__)