aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-20 11:12:11 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-21 04:06:28 +0200
commit4aec11346c13f20940aeb4b91c25a3a9a4f6f853 (patch)
tree315f8a47210be097db1a011c5d3ca5741f10723f
parente440ea768d004ca83993dfb5774daa7971d90c10 (diff)
downloadnx-libs-4aec11346c13f20940aeb4b91c25a3a9a4f6f853.tar.gz
nx-libs-4aec11346c13f20940aeb4b91c25a3a9a4f6f853.tar.bz2
nx-libs-4aec11346c13f20940aeb4b91c25a3a9a4f6f853.zip
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>
-rw-r--r--nx-X11/programs/Xserver/dix/extension.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c
index 5b6caaafb..bc106d83c 100644
--- 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,7 +260,8 @@ CloseDownExtensions()
for (i = NumExtensions - 1; i >= 0; i--)
{
- (* extensions[i]->CloseDown)(extensions[i]);
+ if (extensions[i]->CloseDown)
+ (* extensions[i]->CloseDown)(extensions[i]);
NumExtensions = i;
xfree(extensions[i]->name);
for (j = extensions[i]->num_aliases; --j >= 0;)