r493 - trunk

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2008-02-19 20:13:53 -0500 (Tue, 19 Feb 2008)
New Revision: 493

Modified:
   trunk/mojosetup.c
Log:
If we're going to pick the environment variable anyhow, don't bother iterating
 over the command line arguments in cmdlinestr().


Modified: trunk/mojosetup.c
===================================================================
--- trunk/mojosetup.c	2008-02-20 01:12:47 UTC (rev 492)
+++ trunk/mojosetup.c	2008-02-20 01:13:53 UTC (rev 493)
@@ -260,6 +260,13 @@
     const char **argv = GArgv;
     int i;
 
+    if (envr != NULL)
+    {
+        const char *val = getenv(envr);
+        if (val != NULL)
+            return val;
+    } // if
+
     if (arg == NULL)
         return deflt;
 
@@ -286,13 +293,6 @@
             return ((argv[i+1] == NULL) ? deflt : argv[i+1]);
     } // for
 
-    if (envr != NULL)
-    {
-        const char *val = getenv(envr);
-        if (val != NULL)
-            return val;
-    } // if
-
     return deflt;
 } // cmdlinestr