From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 18 Jul 2012 10:23:56 +0000 (+0100)
Subject: Introduce virReportError macro for general error reporting
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7e94acd4fc470ea46ab94f21f7fe718d512ca3b1;p=libvirt.git

Introduce virReportError macro for general error reporting

Nearly every source file does something like

  #define VIR_FROM_THIS VIR_FROM_FOO
  #define virFooReportErorr(code, ...) \
     virReportErrorHelper(VIR_FROM_THIS, code,  __FILE__,    \
                          __FUNCTION__, __LINE__, \
                          __VA_ARGS__)

This creates needless duplication and inconsistent error
reporting function names in each file. It is trivial to
just have virterror_internal.h provide a virReportError
macro that is equivalent

* src/util/virterror_internal.h: Define virReportError(code, ...)

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/cfg.mk b/cfg.mk
index 6dfe799774..69b2a288d0 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -560,6 +560,7 @@ msg_gen_function += virNetworkReportError
 msg_gen_function += virNodeDeviceReportError
 msg_gen_function += virNWFilterReportError
 msg_gen_function += virRaiseError
+msg_gen_function += virReportError
 msg_gen_function += virReportErrorHelper
 msg_gen_function += virReportSystemError
 msg_gen_function += virSecretReportError
diff --git a/src/util/virterror_internal.h b/src/util/virterror_internal.h
index cb7df03c52..06417b5e10 100644
--- a/src/util/virterror_internal.h
+++ b/src/util/virterror_internal.h
@@ -153,6 +153,9 @@ void virReportOOMErrorFull(int domcode,
 # define virReportOOMError() \
     virReportOOMErrorFull(VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
 
+# define virReportError(code, ...)                                   \
+    virReportErrorHelper(VIR_FROM_THIS, code, __FILE__,              \
+                         __FUNCTION__, __LINE__, __VA_ARGS__)
 
 int virSetError(virErrorPtr newerr);
 void virDispatchError(virConnectPtr conn);