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

miinitext: Use ARRAY_SIZE rather than sentinel 

NULL sentinels are totally lame.

v2: numExtensionModules isn't public, so keep using the provided
    sentinal - Keith Packard <keithp@keithp.com>

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Stéphane Marchesin <stephane.marchesin@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Daniel Stone 2012-07-10 02:03:00 +01:00 committed by Keith Packard
parent f48d8f58b3
commit d785368e0e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mi/miinitext.c
View File

@ -172,15 +172,16 @@ static ExtensionToggle ExtensionToggleList[] = {
#ifdef XV #ifdef XV
{"XVideo", &noXvExtension}, {"XVideo", &noXvExtension},
#endif #endif
{NULL, NULL}
}; };
Bool Bool
EnableDisableExtension(const char *name, Bool enable) EnableDisableExtension(const char *name, Bool enable)
{ {
ExtensionToggle *ext = &ExtensionToggleList[0]; ExtensionToggle *ext;
int i;
for (ext = &ExtensionToggleList[0]; ext->name != NULL; ext++) { for (i = 0; i < ARRAY_SIZE(ExtensionToggleList); i++) {
ext = &ExtensionToggleList[i];
if (strcmp(name, ext->name) == 0) { if (strcmp(name, ext->name) == 0) {
if (ext->disablePtr != NULL) { if (ext->disablePtr != NULL) {
*ext->disablePtr = !enable; *ext->disablePtr = !enable;
@ -396,7 +397,6 @@ static ExtensionModule staticExtensions[] = {
#ifdef DAMAGE #ifdef DAMAGE
{DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL}, {DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL},
#endif #endif
{NULL, NULL, NULL, NULL, NULL}
}; };
/*ARGSUSED*/ void /*ARGSUSED*/ void
@ -408,7 +408,7 @@ InitExtensions(int argc, char *argv[])
if (!listInitialised) { if (!listInitialised) {
/* Add built-in extensions to the list. */ /* Add built-in extensions to the list. */
for (i = 0; staticExtensions[i].name; i++) for (i = 0; i < ARRAY_SIZE(staticExtensions); i++)
LoadExtension(&staticExtensions[i], TRUE); LoadExtension(&staticExtensions[i], TRUE);
/* Sort the extensions according the init dependencies. */ /* Sort the extensions according the init dependencies. */