Merge pull request #55 from keith-packard/opt-warn-fixes

Enable optimization, fix more warnings

Author: BartMassey

Xkw/Hand.c

@@ -556,6 +556,7 @@ DoInputCallback(Widget gw, Action action,
         XkwTranslateCoordsPosition(start_location.w, gw, &w_x, &w_y);
         dx = w_x - start_location.x;
         dy = w_y - start_location.y;
+        hand_action = HandActionStart;
 
         if (dx * dx + dy * dy >= motion_min)
             start_location.dragging = TRUE;

Xkw/Layout.c

@@ -739,13 +739,13 @@ ComputeSizes (BoxPtr box)
     BoxPtr	    child;
     GlueRec	    stretch;
     GlueRec	    shrink;
-    GlueRec	    totalGlue[2];
+    GlueRec	    totalGlue[2] = { { .order = 0, .value = 0 }, { .order = 0, .value = 0} };
     double	    remainingGlue = 0.0;
     GluePtr	    glue;
     int		    size;
     int		    totalSizes;
     int		    finalSize[2];
-    int		    totalChange[2];
+    int		    totalChange[2] = { 0, 0 };
     int		    change;
     int		    remainingChange = 0;
     Bool	    shrinking = 0;

kcribbage/xt.c

@@ -388,7 +388,7 @@ static const CardsRank CardsRankMap[] = {
 };
 
 static void
-updateCards (Widget w, CARD *h, int n, CribbageCardPtr cards, BOOLEAN blank)
+updateCards (Widget w, CARD *h, int n, CribbageCardPtr cards, int len, BOOLEAN blank)
 {
     int		    i;
     CardsSuit	    suit;
@@ -424,7 +424,7 @@ updateCards (Widget w, CARD *h, int n, CribbageCardPtr cards, BOOLEAN blank)
                 cards[i].private = CardsAddCard (w, &cards[i].card, 0, i);
         }
     }
-    for (; i < NUM_CARDS; i++) {
+    for (; i < len; i++) {
 	if (cards[i].private)
 	{
 	    CardsRemoveCard (w, cards[i].private);
@@ -452,7 +452,7 @@ UIPrintHand (CARD *h, int n, int who, BOOLEAN blank)
         w = widget(who);
         cards = Cards(who);
     }
-    updateCards (w, h, n, cards, blank);
+    updateCards (w, h, n, cards, NUM_CARDS, blank);
 }
 
 void
@@ -476,9 +476,9 @@ UIPrintCrib (int who, CARD *card, BOOLEAN blank)
 	ocards = compcribCards;
     }
 
-    updateCards (w, crib, 4, cards, TRUE);
-    updateCards (ow, NULL, 0, ocards, TRUE);
-    updateCards (deckWidget, card, 1, deckCards, blank);
+    updateCards (w, crib, 4, cards, NUM_CARDS, TRUE);
+    updateCards (ow, NULL, 0, ocards, NUM_CARDS, TRUE);
+    updateCards (deckWidget, card, 1, deckCards, 1, blank);
 }
 
 void

kmontana/montana.c

@@ -707,7 +707,7 @@ InputCallback (Widget w, XtPointer closure, XtPointer data)
     CardStackPtr    stack = NULL;
     CardStackPtr    startStack = NULL;
     int             i;
-    Boolean         hintForward;
+    Boolean         hintForward = True;
     String          type = "";
 
     (void) closure;
@@ -751,6 +751,7 @@ InputCallback (Widget w, XtPointer closure, XtPointer data)
         else
             hintForward = True;
         break;
+    default:
     case HandActionUnexpand:
         i = UNHINT;
         break;

kslyfox/slyfox.c

@@ -800,7 +800,8 @@ StackCallback (Widget w, XtPointer closure, XtPointer data)
         else if (game_state == GAME_DEAL) {
             Message(message, "Selected stack is empty.");
             break;
-        }
+        } else
+            card = NULL;
         if (game_state == GAME_DEAL) {
             if (to_type == STACK_TYPE_ACE || to_type == STACK_TYPE_KING) {
                 Message(message, "Can't move %P.", &card->card);

meson.build

@@ -22,7 +22,12 @@
 project('kgames', 'c',
 	license : 'MIT',
 	version: '2.1',
-	default_options: ['bindir=games', 'datadir=share', 'warning_level=3'])
+	default_options: [
+	  'bindir=games',
+	  'datadir=share',
+	  'warning_level=3',
+	  'buildtype=debugoptimized',
+	])
 
 c_compiler = meson.get_compiler('c')
 
@@ -85,6 +90,11 @@ c_warnings = ['-Werror=implicit-function-declaration',
 	      '-Warray-bounds',
 	      '-Wold-style-definition',
 	      '-Wno-overlength-strings',
+	      '-fstack-protector-strong',
+	      '-Werror=format',
+	      '-Werror=format-security',
+	      '-Werror-date-time',
+	      '-D_FORTIFY_SOURCE=2',
 	     ]
 
 add_project_arguments(c_compiler.get_supported_arguments(c_warnings), language : 'c')

xmille/animate.c

@@ -211,6 +211,7 @@ compute_position (int player, int type, int arg, int *xp, int *yp)
 			col = arg;
 			break;
 		case 1:
+                default:
 			w = computer_play;
 			yForce = -HEIGHT;
 			break;
@@ -234,6 +235,7 @@ compute_position (int player, int type, int arg, int *xp, int *yp)
 			w = human_play;
 			break;
 		case 1:
+                default:
 			w = computer_play;
 			break;
 		}
@@ -246,6 +248,7 @@ compute_position (int player, int type, int arg, int *xp, int *yp)
 			w = human_play;
 			break;
 		case 1:
+                default:
 			w = computer_play;
 			break;
 		}
@@ -258,6 +261,7 @@ compute_position (int player, int type, int arg, int *xp, int *yp)
 			w = human_play;
 			break;
 		case 1:
+                default:
 			w = computer_play;
 			break;
 		}
@@ -270,6 +274,7 @@ compute_position (int player, int type, int arg, int *xp, int *yp)
 			w = human_play;
 			break;
 		case 1:
+                default:
 			w = computer_play;
 			break;
 		}
@@ -282,25 +287,31 @@ compute_position (int player, int type, int arg, int *xp, int *yp)
 			w = human_play;
 			break;
 		case 1:
+                default:
 			w = computer_play;
 			break;
 		}
 		row = 0;
 		col = 0;
 		break;
-		break;
 	case ANIMATE_SAFETY:
 		switch (player) {
 		case 0:
 			w = human_safeties;
 			break;
 		case 1:
+                default:
 			w = computer_safeties;
 			break;
 		}
 		row = arg & 1;
 		col = (arg & 2) >> 1;
 		break;
+        default:
+                w = deck_hand;
+                row = 0;
+                col = 0;
+                break;
 	}
 	HandRectangleForPos (w, row, col, &r);
 	XtSetArg (args[0], XtNx, &x);

xmille/mille.c

@@ -50,7 +50,10 @@ main(int ac, char **av)
 	bool	restore;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+	if (setregid(getgid(), getgid()) < 0) {
+            printf("setregid failed\n");
+            exit(1);
+        }
 
 	if (strcmp(av[0], "a.out") == 0) {
 		outf = fopen("q", "w");

xmille/uiXt.c

@@ -698,7 +698,7 @@ init_ui (int *argc, char **argv)
     Colormap	def_cm;
     extern double	animation_speed;
     unsigned long	gcmask;
-    Pixmap		grayStipple;
+    Pixmap		grayStipple = None;
     Arg			arg[2];
     Visual		*visual;
 

xreversi/genedge.c

@@ -10,7 +10,7 @@ int
 main (int argc, char ** argv)
 {
 	if (argc > 1)
-		freopen(argv[1], "w", stdout);
+                stdout = freopen(argv[1], "w", stdout);
 	register int	i;
 	for (board[1] = -1; board[1] <= 2; board[1]++)
 	for (board[2] = -1; board[2] <= 2; board[2]++)