frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

miinitext: avoid allocating a sentinel ExtensionModule 

With all the logic now in place there is no need to allocate a separate
ExtensionModule to be used as a sentinel.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Emil Velikov 2013-09-26 20:16:31 +01:00
parent b421ac8e02
commit d415b9d69f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mi/miinitext.c
View File

@ -331,7 +331,7 @@ InitExtensions(int argc, char *argv[])
AddStaticExtensions(); AddStaticExtensions();
for (i = 0; ExtensionModuleList[i].name != NULL; i++) { for (i = 0; i < numExtensionModules; i++) {
ext = &ExtensionModuleList[i]; ext = &ExtensionModuleList[i];
if (ext->initFunc != NULL && if (ext->initFunc != NULL &&
(ext->disablePtr == NULL || !*ext->disablePtr)) { (ext->disablePtr == NULL || !*ext->disablePtr)) {
@ -352,14 +352,13 @@ NewExtensionModule(void)
n = numExtensionModules + 1; n = numExtensionModules + 1;
ExtensionModuleList = realloc(ExtensionModuleList, ExtensionModuleList = realloc(ExtensionModuleList,
(n + 1) * sizeof(ExtensionModule)); n * sizeof(ExtensionModule));
if (ExtensionModuleList == NULL) { if (ExtensionModuleList == NULL) {
ExtensionModuleList = save; ExtensionModuleList = save;
return NULL; return NULL;
} }
else { else {
numExtensionModules++; numExtensionModules++;
ExtensionModuleList[numExtensionModules].name = NULL;
return ExtensionModuleList + (numExtensionModules - 1); return ExtensionModuleList + (numExtensionModules - 1);
} }
} }