From: Michal Privoznik <mpriv...@redhat.com> Some variables are annotated with G_GNUC_UNUSED attribute so that compiles knows to not complain about unused variable. Well, some variables are annotated and then used. Drop the G_GNUC_UNUSED attribute in such cases.
Signed-off-by: Michal Privoznik <mpriv...@redhat.com> --- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 ++-- src/security/security_selinux.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 68ac39611f..40907c9364 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -349,7 +349,7 @@ AppArmorSecurityManagerGetDOI(virSecurityManager *mgr G_GNUC_UNUSED) * called on shutdown. */ static int -AppArmorGenSecurityLabel(virSecurityManager *mgr G_GNUC_UNUSED, +AppArmorGenSecurityLabel(virSecurityManager *mgr, virDomainDef *def) { g_autofree char *profile_name = NULL; diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 3ecbc7277d..2210117f12 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1703,7 +1703,7 @@ struct _virSecurityDACChardevCallbackData { static int virSecurityDACRestoreChardevCallback(virDomainDef *def, - virDomainChrDef *dev G_GNUC_UNUSED, + virDomainChrDef *dev, void *opaque) { struct _virSecurityDACChardevCallbackData *data = opaque; @@ -2069,7 +2069,7 @@ virSecurityDACRestoreAllLabel(virSecurityManager *mgr, static int virSecurityDACSetChardevCallback(virDomainDef *def, - virDomainChrDef *dev G_GNUC_UNUSED, + virDomainChrDef *dev, void *opaque) { struct _virSecurityDACChardevCallbackData *data = opaque; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index fa5d1568eb..402e0b7737 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1488,7 +1488,7 @@ virSecuritySELinuxFSetFilecon(int fd, char *tcon) /* Set fcon to the appropriate label for path and mode, or return -1. */ static int -getContext(virSecurityManager *mgr G_GNUC_UNUSED, +getContext(virSecurityManager *mgr, const char *newpath, mode_t mode, char **fcon) { virSecuritySELinuxData *data = virSecurityManagerGetPrivateData(mgr); @@ -2796,7 +2796,7 @@ struct _virSecuritySELinuxChardevCallbackData { static int virSecuritySELinuxRestoreSecurityChardevCallback(virDomainDef *def, - virDomainChrDef *dev G_GNUC_UNUSED, + virDomainChrDef *dev, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data = opaque; @@ -3071,7 +3071,7 @@ virSecuritySELinuxSetProcessLabel(virSecurityManager *mgr G_GNUC_UNUSED, static int virSecuritySELinuxSetChildProcessLabel(virSecurityManager *mgr G_GNUC_UNUSED, virDomainDef *def, - bool useBinarySpecificLabel G_GNUC_UNUSED, + bool useBinarySpecificLabel, virCommand *cmd) { /* TODO: verify DOI */ @@ -3232,7 +3232,7 @@ virSecuritySELinuxClearSocketLabel(virSecurityManager *mgr G_GNUC_UNUSED, static int virSecuritySELinuxSetSecurityChardevCallback(virDomainDef *def, - virDomainChrDef *dev G_GNUC_UNUSED, + virDomainChrDef *dev, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data = opaque; -- 2.49.1