Allow CloseDownProc to be NULL.

Backported from X.org: commit ae67508392261ae47858692668a0c192ef4a9d7b Author: Mathieu Bérard <mathieu.berard@crans.org> Date: Fri Jul 25 10:05:30 2008 -0400 Fix AddExtension now that CloseDownProc can be NULL. commit 6bcde69585fcc8f8dbfe81c115649f19274922fa Author: Adam Jackson <ajax@redhat.com> Date: Thu Jul 24 09:13:26 2008 -0400 Allow extension closedown hook to be null. Authors: Adam Jackson <ajax@redhat.com> Mathieu Bérard <mathieu.berard@crans.org> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Allow CloseDownProc to be NULL.
4aec1134 · Mike Gabriel · e440ea76 · 4aec1134
Commit 4aec1134 authored Jun 20, 2016 by Mike Gabriel
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

extension.c nx-X11/programs/Xserver/dix/extension.c +2 -1

No files found.
--- a/nx-X11/programs/Xserver/dix/extension.c
+++ b/nx-X11/programs/Xserver/dix/extension.c
@@ -89,7 +89,7 @@ AddExtension(char *name, int NumEvents, int NumErrors,
    int i;
    register ExtensionEntry *ext, **newexts;

-    if (!MainProc || !SwappedMainProc || !CloseDownProc || !MinorOpcodeProc)
+    if (!MainProc || !SwappedMainProc || !MinorOpcodeProc)
        return((ExtensionEntry *) NULL);
    if ((lastEvent + NumEvents > LAST_EVENT) || 
 	        (unsigned)(lastError + NumErrors > LAST_ERROR))
@@ -260,6 +260,7 @@ CloseDownExtensions()

    for (i = NumExtensions - 1; i >= 0; i--)
    {
+	if (extensions[i]->CloseDown)
 	    (* extensions[i]->CloseDown)(extensions[i]);
 	NumExtensions = i;
 	xfree(extensions[i]->name);