External/libvirt
1
0
Fork 0
Code

Introduce virReportError macro for general error reporting

Browse Source 
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>

(cherry picked from commit 7e94acd4fc470ea46ab94f21f7fe718d512ca3b1)
This commit is contained in:
Daniel P. Berrange 2012-07-18 11:23:56 +01:00 committed by Guido Günther
parent 5adafc831d
commit 4616ff521e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cfg.mk
View File

@ -560,6 +560,7 @@ msg_gen_function += virNetworkReportError
msg_gen_function += virNodeDeviceReportError msg_gen_function += virNodeDeviceReportError
msg_gen_function += virNWFilterReportError msg_gen_function += virNWFilterReportError
msg_gen_function += virRaiseError msg_gen_function += virRaiseError
msg_gen_function += virReportError
msg_gen_function += virReportErrorHelper msg_gen_function += virReportErrorHelper
msg_gen_function += virReportSystemError msg_gen_function += virReportSystemError
msg_gen_function += virSecretReportError msg_gen_function += virSecretReportError

3
src/util/virprocess.c
View File

@ -40,9 +40,6 @@
#include "util.h" #include "util.h"
#include "virstring.h" #include "virstring.h"
#include "ignore-value.h" #include "ignore-value.h"
#define virReportError(code, ...) \
virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__)
#define VIR_FROM_THIS VIR_FROM_NONE #define VIR_FROM_THIS VIR_FROM_NONE

3
src/util/virterror_internal.h
View File

@ -76,6 +76,9 @@ void virReportOOMErrorFull(int domcode,
# define virReportOOMError() \ # define virReportOOMError() \
virReportOOMErrorFull(VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__) virReportOOMErrorFull(VIR_FROM_THIS, __FILE__, __FUNCTION__, __LINE__)
# define virReportError(code, ...) \
virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__)
int virSetError(virErrorPtr newerr); int virSetError(virErrorPtr newerr);
void virDispatchError(virConnectPtr conn); void virDispatchError(virConnectPtr conn);