Changeset 9950

Timestamp:

2005-05-25T14:14:50+12:00 (19 years ago)

Author:

jrm21

Message:

minor change to while loop, slightly more efficient but no semantic difference

File:

• trunk/gsdl/lib/display.cpp (modified) (1 diff)

trunk/gsdl/lib/display.cpp

@@ -1632 +1632 @@
   text_tlist::iterator packageend = packagelist.end();
   mvalue *macrovalue = NULL;
-  while ((macrovalue == NULL) && (packagehere != packageend)) 
+  while (packagehere != packageend)
     {
       // first look in the currentmacros
       macrovalue = currentmacros->macro_find(*packagehere, macroname);
-      if (macrovalue == NULL)
-    macrovalue = currentmacros->macro_find("Style", macroname);
+      if (macrovalue != NULL)
+    break;
+
+      macrovalue = currentmacros->macro_find("Style", macroname);
+      if (macrovalue != NULL)
+    break;
 
       // look in the collection specific macros
-      if (macrovalue == NULL) {
-    macrovalue = macro_find(collectionmacros,*packagehere,macroname);
-      }
+      macrovalue = macro_find(collectionmacros,*packagehere,macroname);
+      if (macrovalue != NULL)
+    break;
 
       // and again in the collection specific package "Style"
-      if (macrovalue == NULL) {
-    macrovalue = macro_find(collectionmacros,(char*)"Style",macroname);
-      }
+      macrovalue = macro_find(collectionmacros,(char*)"Style",macroname);
+      if (macrovalue != NULL)
+    break;
 
       // look in the default macros
-      if (macrovalue == NULL) {
-    macrovalue = macro_find(defaultmacros,*packagehere,macroname);
-      }
+      macrovalue = macro_find(defaultmacros,*packagehere,macroname);
+      if (macrovalue != NULL)
+    break;
 
       // and again in the package "Style"
-      if (macrovalue == NULL) {
-    macrovalue = macro_find(defaultmacros,(char*)"Style",macroname);
-      }
-
-      if (macrovalue == NULL) ++packagehere;
+      macrovalue = macro_find(defaultmacros,(char*)"Style",macroname);
+      if (macrovalue != NULL)
+    break;
+      ++packagehere;
     }