openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

logging: use G_GNUC_UNUSED 

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2019-10-14 14:45:33 +02:00
parent da24875847
commit 227d405d1d
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/logging/log_daemon.c
View File

@ -422,8 +422,8 @@ virLogDaemonUnixSocketPaths(bool privileged,
static void static void
virLogDaemonErrorHandler(void *opaque ATTRIBUTE_UNUSED, virLogDaemonErrorHandler(void *opaque G_GNUC_UNUSED,
virErrorPtr err ATTRIBUTE_UNUSED) virErrorPtr err G_GNUC_UNUSED)
{ {
/* Don't do anything, since logging infrastructure already /* Don't do anything, since logging infrastructure already
* took care of reporting the error */ * took care of reporting the error */
@ -487,16 +487,16 @@ virLogDaemonVersion(const char *argv0)
static void static void
virLogDaemonShutdownHandler(virNetDaemonPtr dmn, virLogDaemonShutdownHandler(virNetDaemonPtr dmn,
siginfo_t *sig ATTRIBUTE_UNUSED, siginfo_t *sig G_GNUC_UNUSED,
void *opaque ATTRIBUTE_UNUSED) void *opaque G_GNUC_UNUSED)
{ {
virNetDaemonQuit(dmn); virNetDaemonQuit(dmn);
} }
static void static void
virLogDaemonExecRestartHandler(virNetDaemonPtr dmn, virLogDaemonExecRestartHandler(virNetDaemonPtr dmn,
siginfo_t *sig ATTRIBUTE_UNUSED, siginfo_t *sig G_GNUC_UNUSED,
void *opaque ATTRIBUTE_UNUSED) void *opaque G_GNUC_UNUSED)
{ {
execRestart = true; execRestart = true;
virNetDaemonQuit(dmn); virNetDaemonQuit(dmn);
@ -593,7 +593,7 @@ virLogDaemonClientNew(virNetServerClientPtr client,
static void * static void *
virLogDaemonClientNewPostExecRestart(virNetServerClientPtr client, virLogDaemonClientNewPostExecRestart(virNetServerClientPtr client,
virJSONValuePtr object ATTRIBUTE_UNUSED, virJSONValuePtr object G_GNUC_UNUSED,
void *opaque) void *opaque)
{ {
virLogDaemonClientPtr priv = virLogDaemonClientNew(client, opaque); virLogDaemonClientPtr priv = virLogDaemonClientNew(client, opaque);
@ -606,8 +606,8 @@ virLogDaemonClientNewPostExecRestart(virNetServerClientPtr client,
static virJSONValuePtr static virJSONValuePtr
virLogDaemonClientPreExecRestart(virNetServerClientPtr client ATTRIBUTE_UNUSED, virLogDaemonClientPreExecRestart(virNetServerClientPtr client G_GNUC_UNUSED,
void *opaque ATTRIBUTE_UNUSED) void *opaque G_GNUC_UNUSED)
{ {
virJSONValuePtr object = virJSONValueNewObject(); virJSONValuePtr object = virJSONValueNewObject();

2
src/logging/log_daemon_config.c
View File

@ -63,7 +63,7 @@ virLogDaemonConfigFilePath(bool privileged, char **configfile)
virLogDaemonConfigPtr virLogDaemonConfigPtr
virLogDaemonConfigNew(bool privileged ATTRIBUTE_UNUSED) virLogDaemonConfigNew(bool privileged G_GNUC_UNUSED)
{ {
virLogDaemonConfigPtr data; virLogDaemonConfigPtr data;

22
src/logging/log_daemon_dispatch.c
View File

@ -37,8 +37,8 @@ VIR_LOG_INIT("logging.log_daemon_dispatch");
#include "log_daemon_dispatch_stubs.h" #include "log_daemon_dispatch_stubs.h"
static int static int
virLogManagerProtocolDispatchDomainOpenLogFile(virNetServerPtr server ATTRIBUTE_UNUSED, virLogManagerProtocolDispatchDomainOpenLogFile(virNetServerPtr server G_GNUC_UNUSED,
virNetServerClientPtr client ATTRIBUTE_UNUSED, virNetServerClientPtr client G_GNUC_UNUSED,
virNetMessagePtr msg, virNetMessagePtr msg,
virNetMessageErrorPtr rerr, virNetMessageErrorPtr rerr,
virLogManagerProtocolDomainOpenLogFileArgs *args, virLogManagerProtocolDomainOpenLogFileArgs *args,
@ -76,9 +76,9 @@ virLogManagerProtocolDispatchDomainOpenLogFile(virNetServerPtr server ATTRIBUTE_
static int static int
virLogManagerProtocolDispatchDomainGetLogFilePosition(virNetServerPtr server ATTRIBUTE_UNUSED, virLogManagerProtocolDispatchDomainGetLogFilePosition(virNetServerPtr server G_GNUC_UNUSED,
virNetServerClientPtr client ATTRIBUTE_UNUSED, virNetServerClientPtr client G_GNUC_UNUSED,
virNetMessagePtr msg ATTRIBUTE_UNUSED, virNetMessagePtr msg G_GNUC_UNUSED,
virNetMessageErrorPtr rerr, virNetMessageErrorPtr rerr,
virLogManagerProtocolDomainGetLogFilePositionArgs *args, virLogManagerProtocolDomainGetLogFilePositionArgs *args,
virLogManagerProtocolDomainGetLogFilePositionRet *ret) virLogManagerProtocolDomainGetLogFilePositionRet *ret)
@ -106,9 +106,9 @@ virLogManagerProtocolDispatchDomainGetLogFilePosition(virNetServerPtr server ATT
static int static int
virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTRIBUTE_UNUSED, virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server G_GNUC_UNUSED,
virNetServerClientPtr client ATTRIBUTE_UNUSED, virNetServerClientPtr client G_GNUC_UNUSED,
virNetMessagePtr msg ATTRIBUTE_UNUSED, virNetMessagePtr msg G_GNUC_UNUSED,
virNetMessageErrorPtr rerr, virNetMessageErrorPtr rerr,
virLogManagerProtocolDomainReadLogFileArgs *args, virLogManagerProtocolDomainReadLogFileArgs *args,
virLogManagerProtocolDomainReadLogFileRet *ret) virLogManagerProtocolDomainReadLogFileRet *ret)
@ -144,9 +144,9 @@ virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTRIBUTE_
static int static int
virLogManagerProtocolDispatchDomainAppendLogFile(virNetServerPtr server ATTRIBUTE_UNUSED, virLogManagerProtocolDispatchDomainAppendLogFile(virNetServerPtr server G_GNUC_UNUSED,
virNetServerClientPtr client ATTRIBUTE_UNUSED, virNetServerClientPtr client G_GNUC_UNUSED,
virNetMessagePtr msg ATTRIBUTE_UNUSED, virNetMessagePtr msg G_GNUC_UNUSED,
virNetMessageErrorPtr rerr, virNetMessageErrorPtr rerr,
virLogManagerProtocolDomainAppendLogFileArgs *args, virLogManagerProtocolDomainAppendLogFileArgs *args,
virLogManagerProtocolDomainAppendLogFileRet *ret) virLogManagerProtocolDomainAppendLogFileRet *ret)

6
src/logging/log_handler.c
View File

@ -566,9 +566,9 @@ virLogHandlerDomainReadLogFile(virLogHandlerPtr handler,
int int
virLogHandlerDomainAppendLogFile(virLogHandlerPtr handler, virLogHandlerDomainAppendLogFile(virLogHandlerPtr handler,
const char *driver ATTRIBUTE_UNUSED, const char *driver G_GNUC_UNUSED,
const unsigned char *domuuid ATTRIBUTE_UNUSED, const unsigned char *domuuid G_GNUC_UNUSED,
const char *domname ATTRIBUTE_UNUSED, const char *domname G_GNUC_UNUSED,
const char *path, const char *path,
const char *message, const char *message,
unsigned int flags) unsigned int flags)