From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 26 Sep 2013 19:08:16 +0000 (+0100)
Subject: miinitext: move AddStaticExtensions() to LoadExtension()
X-Git-Tag: upstream/1.15.99.902~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fea450d41a03d32c10c7da162dfaadd8ead4ece;p=platform%2Fupstream%2Fxorg-server.git

miinitext: move AddStaticExtensions() to LoadExtension()

Separate the function from NewExtensionModule() as the former does
only memory reallocation. No functional change.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
---

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 67511b8..9d5125e 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -346,10 +346,6 @@ NewExtensionModule(void)
     ExtensionModule *save = ExtensionModuleList;
     int n;
 
-    /* Make sure built-in extensions get added to the list before those
-     * in modules. */
-    AddStaticExtensions();
-
     /* Sanity check */
     if (!ExtensionModuleList)
         numExtensionModules = 0;
@@ -376,6 +372,10 @@ LoadExtension(const ExtensionModule * e, Bool builtin)
     if (e == NULL || e->name == NULL)
         return;
 
+    /* Make sure built-in extensions get added to the list before those
+     * in modules. */
+    AddStaticExtensions();
+
     if (!(newext = NewExtensionModule()))
         return;