[libvirt] [PATCH 15/35] logging: use G_GNUC_UNUSED

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/logging/log_daemon.c | 18 +++++++++--------- src/logging/log_daemon_config.c | 2 +- src/logging/log_daemon_dispatch.c | 22 +++++++++++----------- src/logging/log_handler.c | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 9621702138..e56dbf2919 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -422,8 +422,8 @@ virLogDaemonUnixSocketPaths(bool privileged, static void -virLogDaemonErrorHandler(void *opaque ATTRIBUTE_UNUSED, - virErrorPtr err ATTRIBUTE_UNUSED) +virLogDaemonErrorHandler(void *opaque G_GNUC_UNUSED, + virErrorPtr err G_GNUC_UNUSED) { /* Don't do anything, since logging infrastructure already * took care of reporting the error */ @@ -487,16 +487,16 @@ virLogDaemonVersion(const char *argv0) static void virLogDaemonShutdownHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virNetDaemonQuit(dmn); } static void virLogDaemonExecRestartHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { execRestart = true; virNetDaemonQuit(dmn); @@ -593,7 +593,7 @@ virLogDaemonClientNew(virNetServerClientPtr client, static void * virLogDaemonClientNewPostExecRestart(virNetServerClientPtr client, - virJSONValuePtr object ATTRIBUTE_UNUSED, + virJSONValuePtr object G_GNUC_UNUSED, void *opaque) { virLogDaemonClientPtr priv = virLogDaemonClientNew(client, opaque); @@ -606,8 +606,8 @@ virLogDaemonClientNewPostExecRestart(virNetServerClientPtr client, static virJSONValuePtr -virLogDaemonClientPreExecRestart(virNetServerClientPtr client ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +virLogDaemonClientPreExecRestart(virNetServerClientPtr client G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virJSONValuePtr object = virJSONValueNewObject(); diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_config.c index c7dfa19b5d..9895babc2f 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -63,7 +63,7 @@ virLogDaemonConfigFilePath(bool privileged, char **configfile) virLogDaemonConfigPtr -virLogDaemonConfigNew(bool privileged ATTRIBUTE_UNUSED) +virLogDaemonConfigNew(bool privileged G_GNUC_UNUSED) { virLogDaemonConfigPtr data; diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c index 0442e8cd94..73b5efd5a0 100644 --- a/src/logging/log_daemon_dispatch.c +++ b/src/logging/log_daemon_dispatch.c @@ -37,8 +37,8 @@ VIR_LOG_INIT("logging.log_daemon_dispatch"); #include "log_daemon_dispatch_stubs.h" static int -virLogManagerProtocolDispatchDomainOpenLogFile(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, +virLogManagerProtocolDispatchDomainOpenLogFile(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, virNetMessagePtr msg, virNetMessageErrorPtr rerr, virLogManagerProtocolDomainOpenLogFileArgs *args, @@ -76,9 +76,9 @@ virLogManagerProtocolDispatchDomainOpenLogFile(virNetServerPtr server ATTRIBUTE_ static int -virLogManagerProtocolDispatchDomainGetLogFilePosition(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +virLogManagerProtocolDispatchDomainGetLogFilePosition(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLogManagerProtocolDomainGetLogFilePositionArgs *args, virLogManagerProtocolDomainGetLogFilePositionRet *ret) @@ -106,9 +106,9 @@ virLogManagerProtocolDispatchDomainGetLogFilePosition(virNetServerPtr server ATT static int -virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLogManagerProtocolDomainReadLogFileArgs *args, virLogManagerProtocolDomainReadLogFileRet *ret) @@ -144,9 +144,9 @@ virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTRIBUTE_ static int -virLogManagerProtocolDispatchDomainAppendLogFile(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +virLogManagerProtocolDispatchDomainAppendLogFile(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLogManagerProtocolDomainAppendLogFileArgs *args, virLogManagerProtocolDomainAppendLogFileRet *ret) diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 16c5ce0cf2..025a546b51 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -566,9 +566,9 @@ virLogHandlerDomainReadLogFile(virLogHandlerPtr handler, int virLogHandlerDomainAppendLogFile(virLogHandlerPtr handler, - const char *driver ATTRIBUTE_UNUSED, - const unsigned char *domuuid ATTRIBUTE_UNUSED, - const char *domname ATTRIBUTE_UNUSED, + const char *driver G_GNUC_UNUSED, + const unsigned char *domuuid G_GNUC_UNUSED, + const char *domname G_GNUC_UNUSED, const char *path, const char *message, unsigned int flags) -- 2.19.2