Clang: Fixed some compiler warnings

skyjake · Jul 13, 2012 · c171b04 · c171b04
1 parent 22bc606
commit c171b04
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/doomsday/engine/portable/src/b_util.c b/doomsday/engine/portable/src/b_util.c
@@ -643,23 +643,26 @@ void B_AppendEventToString(const ddevent_t* ev, ddstring_t* str)
 
     switch(ev->type)
     {
-        case E_TOGGLE:
-            B_AppendToggleStateToString(ev->toggle.state == ETOG_DOWN? EBTOG_DOWN :
-                                        ev->toggle.state == ETOG_UP? EBTOG_UP :
-                                        EBTOG_REPEAT, str);
-            break;
-
-        case E_AXIS:
-            B_AppendAxisPositionToString(ev->axis.pos >= 0? EBAXIS_BEYOND_POSITIVE :
-                                         EBAXIS_BEYOND_NEGATIVE, ev->axis.pos, str);
-            break;
-
-        case E_ANGLE:
-            B_AppendAnglePositionToString(ev->angle.pos, str);
-            break;
-
-        case E_SYMBOLIC:
-            Str_Appendf(str, "-%s", ev->symbolic.name);
-            break;
+    case E_TOGGLE:
+        B_AppendToggleStateToString(ev->toggle.state == ETOG_DOWN? EBTOG_DOWN :
+                                    ev->toggle.state == ETOG_UP? EBTOG_UP :
+                                    EBTOG_REPEAT, str);
+        break;
+
+    case E_AXIS:
+        B_AppendAxisPositionToString(ev->axis.pos >= 0? EBAXIS_BEYOND_POSITIVE :
+                                     EBAXIS_BEYOND_NEGATIVE, ev->axis.pos, str);
+        break;
+
+    case E_ANGLE:
+        B_AppendAnglePositionToString(ev->angle.pos, str);
+        break;
+
+    case E_SYMBOLIC:
+        Str_Appendf(str, "-%s", ev->symbolic.name);
+        break;
+
+    case E_FOCUS:
+        break;
     }
 }
diff --git a/doomsday/engine/portable/src/rect.c b/doomsday/engine/portable/src/rect.c
@@ -357,8 +357,8 @@ boolean Rect_Equality(const Rect* r, const Rect* other)
 {
     assert(r);
     if(!other) return false;
-    return r == other || Point2_Equality(r->origin, Rect_Origin(other)) &&
-                         Size2_Equality(r->size, Rect_Size(other));
+    return r == other || (Point2_Equality(r->origin, Rect_Origin(other)) &&
+                          Size2_Equality(r->size, Rect_Size(other)));
 }
 
 Rectf* Rectf_New(void)
@@ -680,6 +680,6 @@ boolean Rectf_Equality(const Rectf* r, const Rectf* other)
 {
     assert(r);
     if(!other) return false;
-    return r == other || Point2f_Equality(r->origin, Rectf_Origin(other)) &&
-                         Size2f_Equality(r->size, Rectf_Size(other));
+    return r == other || (Point2f_Equality(r->origin, Rectf_Origin(other)) &&
+                          Size2f_Equality(r->size, Rectf_Size(other)));
 }
diff --git a/doomsday/engine/portable/src/render/rend_console.c b/doomsday/engine/portable/src/render/rend_console.c
@@ -317,7 +317,7 @@ void Rend_ConsoleToggleFullscreen(void)
     if(++consoleMode > CM_SINGLELINE) consoleMode = CM_HALFSCREEN;
     switch(consoleMode)
     {
-    case CM_HALFSCREEN: y = SCREENHEIGHT/2; break;
+    case CM_HALFSCREEN: default: y = SCREENHEIGHT/2; break;
     case CM_FULLSCREEN: y = SCREENHEIGHT; break;
     case CM_SINGLELINE: y = calcConsoleMinHeight(); break;
     }