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:
parent
b421ac8e02
commit
d415b9d69f
|
@ -331,7 +331,7 @@ InitExtensions(int argc, char *argv[])
|
|||
|
||||
AddStaticExtensions();
|
||||
|
||||
for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
|
||||
for (i = 0; i < numExtensionModules; i++) {
|
||||
ext = &ExtensionModuleList[i];
|
||||
if (ext->initFunc != NULL &&
|
||||
(ext->disablePtr == NULL || !*ext->disablePtr)) {
|
||||
|
@ -352,14 +352,13 @@ NewExtensionModule(void)
|
|||
|
||||
n = numExtensionModules + 1;
|
||||
ExtensionModuleList = realloc(ExtensionModuleList,
|
||||
(n + 1) * sizeof(ExtensionModule));
|
||||
n * sizeof(ExtensionModule));
|
||||
if (ExtensionModuleList == NULL) {
|
||||
ExtensionModuleList = save;
|
||||
return NULL;
|
||||
}
|
||||
else {
|
||||
numExtensionModules++;
|
||||
ExtensionModuleList[numExtensionModules].name = NULL;
|
||||
return ExtensionModuleList + (numExtensionModules - 1);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user