]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
selinux: fix compile errors
authorGuido Günther <agx@sigxcpu.org>
Mon, 24 Aug 2015 12:04:37 +0000 (14:04 +0200)
committerCole Robinson <crobinso@redhat.com>
Tue, 22 Sep 2015 00:18:06 +0000 (20:18 -0400)
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)

src/security/security_selinux.c

index da1f2dd45f96a67e581f60a0b713736cf61b46d3..c6da6b03c0791e6b4e4f04f4b11ad10f012b4b89 100644 (file)
@@ -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)