xserver: Branch 'master'

[GitLab Mirror]

 Xext/xselinux_ext.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 047794e3503774c576a815cc170663cbcff198dd
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Sep 11 10:33:25 2018 -0400

    xselinux: warning fix
    
    ../Xext/xselinux_ext.c: In function ‘SELinuxExtensionInit’:
    ../Xext/xselinux_ext.c:692:21: warning: variable ‘extEntry’ set but not used [-Wunused-but-set-variable]
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 1395a563b..5007b442e 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -689,8 +689,6 @@ SELinuxResetProc(ExtensionEntry * extEntry)
 void
 SELinuxExtensionInit(void)
 {
-    ExtensionEntry *extEntry;
-
     /* Check SELinux mode on system, configuration file, and boolean */
     if (!is_selinux_enabled()) {
         LogMessage(X_INFO, "SELinux: Disabled on system\n");
@@ -710,8 +708,7 @@ SELinuxExtensionInit(void)
     SELinuxFlaskInit();
 
     /* Add extension to server */
-    extEntry = AddExtension(SELINUX_EXTENSION_NAME,
-                            SELinuxNumberEvents, SELinuxNumberErrors,
-                            ProcSELinuxDispatch, SProcSELinuxDispatch,
-                            SELinuxResetProc, StandardMinorOpcode);
+    AddExtension(SELINUX_EXTENSION_NAME, SELinuxNumberEvents,
+                 SELinuxNumberErrors, ProcSELinuxDispatch,
+                 SProcSELinuxDispatch, SELinuxResetProc, StandardMinorOpcode);
 }