From f48d8f58b39af0036365368d6ac35319d6d856d5 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 10 Jul 2012 02:02:59 +0100 Subject: [PATCH] extmod: Use ARRAY_SIZE rather than sentinel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the array gets down to size zero (which it does in later patches), gcc complains that the index is out of bounds. Avoid this by using ARRAY_SIZE on extensionModules instead. Signed-off-by: Daniel Stone Reviewed-by: Stéphane Marchesin Signed-off-by: Keith Packard --- hw/xfree86/dixmods/extmod/modinit.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index afee27a59..009852c33 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -101,12 +101,6 @@ static ExtensionModule extensionModules[] = { NULL, NULL}, #endif - { /* DON'T delete this entry ! */ - NULL, - NULL, - NULL, - NULL, - NULL} }; static XF86ModuleVersionInfo VersRec = { @@ -134,7 +128,7 @@ extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin) /* XXX the option stuff here is largely a sample/test case */ - for (i = 0; extensionModules[i].name != NULL; i++) { + for (i = 0; i < ARRAY_SIZE(extensionModules); i++) { #ifdef XSELINUX if (!strcmp(SELINUX_EXTENSION_NAME, extensionModules[i].name)) { pointer o;