Fixed: Warnings given by new version of clang

Some possible use of uninitialized variables.
skyjake · Mar 8, 2013 · f359350 · f359350
1 parent 3deaa57
commit f359350
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/doomsday/client/src/con_main.cpp b/doomsday/client/src/con_main.cpp
@@ -1149,7 +1149,7 @@ static int completeWord(int mode)
     char unambiguous[256];
     const knownword_t* completeWord = NULL;
     const knownword_t** matches = NULL;
-    uint numMatches;
+    uint numMatches = 0;
 
     if(mode == 1)
         cp = (int)complPos - 1;

diff --git a/doomsday/client/src/map/p_ticker.cpp b/doomsday/client/src/map/p_ticker.cpp
@@ -53,6 +53,8 @@ int P_MobjTicker(thinker_t* th, void* context)
 {
     DENG_UNUSED(context);
 
+#ifdef __CLIENT__
+
     uint                i;
     mobj_t*             mo = (mobj_t*) th;
 
@@ -61,7 +63,6 @@ int P_MobjTicker(thinker_t* th, void* context)
         int                 f;
         byte*               haloFactor = &mo->haloFactors[i];
 
-#ifdef __CLIENT__
         // Set the high bit of halofactor if the light is clipped. This will
         // make P_Ticker diminish the factor to zero. Take the first step here
         // and now, though.
@@ -105,9 +106,12 @@ int P_MobjTicker(thinker_t* th, void* context)
 
         *haloFactor &= ~0x7f;
         *haloFactor |= f;
-#endif
     }
 
+#else
+    DENG_UNUSED(th);
+#endif
+
     return false; // Continue iteration.
 }
 

diff --git a/doomsday/client/src/resource/image.cpp b/doomsday/client/src/resource/image.cpp
@@ -330,7 +330,7 @@ uint8_t *Image_LoadFromFile(image_t *img, filehandle_s *_file)
 #else
     // Server does not load image files.
     DENG2_UNUSED2(img, _file);
-    return false;
+    return NULL;
 #endif
 }
 

diff --git a/doomsday/client/src/ui/dd_input.cpp b/doomsday/client/src/ui/dd_input.cpp
@@ -1244,7 +1244,7 @@ void DD_ReadKeyboard(void)
 {
     uint            i, k;
     ddevent_t       ev;
-    size_t          n, numkeyevs;
+    size_t          n, numkeyevs = 0;
     keyevent_t      keyevs[KBDQUESIZE];
 
     // Check the repeaters.

diff --git a/doomsday/libdeng2/include/de/scriptsys/parser.h b/doomsday/libdeng2/include/de/scriptsys/parser.h
@@ -153,8 +153,6 @@ class Parser : public IParser
     // Range of the current statement. Can be a subrange of the full
     // set of tokens.
     TokenRange _statementRange;
-
-    duint _currentIndent;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(de::Parser::CompoundFlags)

diff --git a/doomsday/plugins/common/src/m_ctrl.c b/doomsday/plugins/common/src/m_ctrl.c
@@ -470,8 +470,8 @@ static void iterateBindings(const mndata_bindings_t* binds, const char* bindings
 
         if(*k == '@')
         {
-            for(begin = k - 1; begin > bindings && isdigit(*(begin - 1)); --begin);
-                bid = strtol(begin, NULL, 10);
+            for(begin = k - 1; begin > bindings && isdigit(*(begin - 1)); --begin) {}
+            bid = strtol(begin, NULL, 10);
         }
         else
         {