External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 13:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

virdbus: Remove redundant error macro

Browse Source 
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>
This commit is contained in:
Cole Robinson 2014-05-03 15:46:52 -04:00
parent fa8701ea2b
commit aa7fc495c0
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/util/virdbus.c
View File

@ -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;
}

11
src/util/virerror.h
View File

@ -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__)