]> 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)
committerGuido Günther <agx@sigxcpu.org>
Mon, 24 Aug 2015 12:15:12 +0000 (14:15 +0200)
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]

src/security/security_selinux.c

index d4bfee76c5a5d4ff39be4c5e053d5d00c0d69d0f..d2e5aa20616503ec42dbe2f96c66b8a04aaf1221 100644 (file)
@@ -2505,13 +2505,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)