From: torsten <torsten>
Date: Thu, 20 Aug 2009 10:55:24 +0000 (+0000)
Subject: don't use uninitialized variables
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d3a500e54ea21a628a335c160d3b0344c6f591da;p=simgear.git

don't use uninitialized variables
---

diff --git a/simgear/scene/tgdb/apt_signs.cxx b/simgear/scene/tgdb/apt_signs.cxx
index 34d61c12..311f0c2f 100644
--- a/simgear/scene/tgdb/apt_signs.cxx
+++ b/simgear/scene/tgdb/apt_signs.cxx
@@ -106,10 +106,6 @@ SGMakeSign(SGMaterialLib *matlib, const string& path, const string& content)
     osg::Group* object = new osg::Group;
     object->setName(content);
 
-    SGMaterial *material;
-    Effect *lighted_state;
-    Effect *unlighted_state;
-
     // Part I: parse & measure
     for (const char *s = content.data(); *s; s++) {
         string name;
@@ -219,26 +215,30 @@ SGMakeSign(SGMaterialLib *matlib, const string& path, const string& content)
             }
         }
 
+        SGMaterial *material = NULL;
+
         if (newmat.size()) {
             material = matlib->find(newmat);
-            if (!material) {
-                SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "ignoring unknown material `" << newmat << '\'');
-                continue;
-            }
+        }
+        if (!material) {
+            SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "ignoring unknown material `" << newmat << '\'');
+            continue;
+        }
 
-            // set material states (lighted & unlighted)
-            lighted_state = material->get_effect();
-            string u = newmat + ".unlighted";
 
-            SGMaterial *m = matlib->find(u);
-            if (m) {
-                unlighted_state = m->get_effect();
-            } else {
-                SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "ignoring unknown material `" << u << '\'');
-                unlighted_state = lighted_state;
-            }
-            newmat = "";
+        // set material states (lighted & unlighted)
+        Effect *lighted_state = material->get_effect();
+        Effect *unlighted_state;
+        string u = newmat + ".unlighted";
+
+        SGMaterial *m = matlib->find(u);
+        if (m) {
+            unlighted_state = m->get_effect();
+        } else {
+            SG_LOG(SG_TERRAIN, SG_ALERT, SIGN "ignoring unknown material `" << u << '\'');
+            unlighted_state = lighted_state;
         }
+        newmat = "";
 
         SGMaterialGlyph *glyph = material->get_glyph(name);
         if (!glyph) {