Changeset 1845 for branches/3.0/src/common/interface.c

Timestamp:

04/26/07 19:48:10 (21 months ago)

Author:

aturner

Message:

svn merge -r 1838:1839 ../../trunk .
merges r1839 to 3.0. fixes #167

Files:

• branches/3.0/src/common/interface.c (modified) (1 diff)

branches/3.0/src/common/interface.c

@@ -55 +55 @@
     
     assert(alias);
-    assert(list);
     
-    ptr = list;
+    if (list != NULL) {        
+        ptr = list;
     
-    do {
-        /* check both the alias & name fields */
-        if (strcmp(alias, ptr->alias) == 0)
-            return(ptr->name);
+        do {
+            /* check both the alias & name fields */
+            if (strcmp(alias, ptr->alias) == 0)
+                return(ptr->name);
         
-        if (strcmp(alias, ptr->name) == 0)
-            return(ptr->name);
+            if (strcmp(alias, ptr->name) == 0)
+                return(ptr->name);
             
-        ptr = ptr->next;
-    } while (ptr != NULL);
+            ptr = ptr->next;
+        } while (ptr != NULL);
+    } else {
+        return(alias);
+    }
     
     return(NULL);