From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 24 Aug 2015 12:04:37 +0000 (+0200)
Subject: selinux: fix compile errors
X-Git-Tag: v1.2.18.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb8382fa5fc14dffd1a37bfbace8fc8a549efe15;p=thirdparty%2Flibvirt.git

selinux: fix compile errors

Remove unused variable, tag unused parameter and adjust return type.

introduced by 3f48345f7ec0c44b8ce2371cab454d2118f830b4

CC     security/libvirt_security_manager_la-security_selinux.lo
security/security_selinux.c: In function 'virSecuritySELinuxDomainSetDirLabel':
security/security_selinux.c:2520:5: error: return makes pointer from integer without a cast [-Werror]
security/security_selinux.c:2514:9: error: unused variable 'ret' [-Werror=unused-variable]
security/security_selinux.c:2509:59: error: unused parameter 'mgr' [-Werror=unused-parameter]

(cherry picked from commit 4d4c90dfd5475c100c6fd3fb705011e0d90d793e)
---

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index da1f2dd45f..c6da6b03c0 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -2506,13 +2506,12 @@ virSecuritySELinuxGetSecurityMountOptions(virSecurityManagerPtr mgr,
     return opts;
 }
 
-static char *
-virSecuritySELinuxDomainSetDirLabel(virSecurityManagerPtr mgr,
+static int
+virSecuritySELinuxDomainSetDirLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
                                     virDomainDefPtr def,
                                     const char *path)
 {
     virSecurityLabelDefPtr seclabel;
-    int ret = -1;
 
     seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME);
     if (!seclabel || !seclabel->relabel)