shithub: puzzles

Info  •  Files  •  Log  •  Branches

Fix various departures from C found by `gcc -ansi -pedantic'. I
haven't checked in Makefile changes to enable this, but I'll at
least fix the specific problems it found when enabled as a one-off.

[originally from svn r5902]

--- a/gtk.c

+++ b/gtk.c

@@ -76,7 +76,7 @@

     config_item *cfg;

     int cfg_which, cfgret;

     GtkWidget *cfgbox;

-    char *paste_data;

+    void *paste_data;

     int paste_data_len;

     char *laststatus;

 };

@@ -566,7 +566,7 @@

 		       GTK_SIGNAL_FUNC(win_key_press), ok);

     gtk_window_set_modal(GTK_WINDOW(window), TRUE);

     gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(parent));

-    //set_transient_window_pos(parent, window);

+    /* set_transient_window_pos(parent, window); */

     gtk_widget_show(window);

     gtk_main();

 }

@@ -798,7 +798,7 @@

     gtk_window_set_modal(GTK_WINDOW(fe->cfgbox), TRUE);

     gtk_window_set_transient_for(GTK_WINDOW(fe->cfgbox),

 				 GTK_WINDOW(fe->window));

-    //set_transient_window_pos(fe->window, fe->cfgbox);

+    /* set_transient_window_pos(fe->window, fe->cfgbox); */

     gtk_widget_show(fe->cfgbox);

     gtk_main();

@@ -836,6 +836,8 @@

 void init_paste()

 {

+    unsigned char empty[] = { 0 };

+

     if (paste_initialised)

 	return;

@@ -849,21 +851,21 @@

      * ICCCM, we must do this before we start using cut buffers.

      */

     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),

-		    XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, "", 0);

+		    XA_CUT_BUFFER0, XA_STRING, 8, PropModeAppend, empty, 0);

     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),

-		    XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, "", 0);

+		    XA_CUT_BUFFER1, XA_STRING, 8, PropModeAppend, empty, 0);

     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),

-		    XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, "", 0);

+		    XA_CUT_BUFFER2, XA_STRING, 8, PropModeAppend, empty, 0);

     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),

-		    XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, "", 0);

+		    XA_CUT_BUFFER3, XA_STRING, 8, PropModeAppend, empty, 0);

     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),

-		    XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, "", 0);

+		    XA_CUT_BUFFER4, XA_STRING, 8, PropModeAppend, empty, 0);

     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),

-		    XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, "", 0);

+		    XA_CUT_BUFFER5, XA_STRING, 8, PropModeAppend, empty, 0);

     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),

-		    XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, "", 0);

+		    XA_CUT_BUFFER6, XA_STRING, 8, PropModeAppend, empty, 0);

     XChangeProperty(GDK_DISPLAY(), GDK_ROOT_WINDOW(),

-		    XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, "", 0);

+		    XA_CUT_BUFFER7, XA_STRING, 8, PropModeAppend, empty, 0);

 }

 /* Store data in a cut-buffer. */

--- a/mines.c

+++ b/mines.c

@@ -1291,7 +1291,7 @@

  */

 struct minectx {

-    signed char *grid;

+    char *grid;

     int w, h;

     int sx, sy;

     int allow_big_perturbs;

@@ -1786,7 +1786,7 @@

 	 * We bypass this bit if we're not after a unique grid.

          */

 	if (unique) {

-	    signed char *solvegrid = snewn(w*h, char);

+	    signed char *solvegrid = snewn(w*h, signed char);

 	    struct minectx actx, *ctx = &actx;

 	    int solveret, prevret = -2;

@@ -1933,7 +1933,7 @@

 static char *new_mine_layout(int w, int h, int n, int x, int y, int unique,

 			     random_state *rs, char **game_desc)

 {

-    signed char *grid, *ret, *p;

+    char *grid, *ret, *p;

     unsigned char *bmp;

     int i, area;

@@ -2060,7 +2060,7 @@

 	/*

 	 * For batch-generated grids, pre-open one square.

 	 */

-	signed char *grid;

+	char *grid;

 	char *desc;

 	grid = new_mine_layout(params->w, params->h, params->n,

@@ -2262,7 +2262,7 @@

     memset(state->layout, 0, sizeof(struct mine_layout));

     state->layout->refcount = 1;

-    state->grid = snewn(wh, char);

+    state->grid = snewn(wh, signed char);

     memset(state->grid, -2, wh);

     if (*desc == 'r') {

@@ -2355,7 +2355,7 @@

     ret->just_used_solve = state->just_used_solve;

     ret->layout = state->layout;

     ret->layout->refcount++;

-    ret->grid = snewn(ret->w * ret->h, char);

+    ret->grid = snewn(ret->w * ret->h, signed char);

     memcpy(ret->grid, state->grid, ret->w * ret->h);

     return ret;

@@ -2689,7 +2689,7 @@

     ds->w = state->w;

     ds->h = state->h;

     ds->started = FALSE;

-    ds->grid = snewn(ds->w * ds->h, char);

+    ds->grid = snewn(ds->w * ds->h, signed char);

     memset(ds->grid, -99, ds->w * ds->h);

--- a/net.c

+++ b/net.c

@@ -120,7 +120,7 @@

     if (a->direction > b->direction)

 	return +1;

     return 0;

-};

+}

 static int xyd_cmp_nc(void *av, void *bv) { return xyd_cmp(av, bv); }

--- a/netslide.c

+++ b/netslide.c

@@ -129,7 +129,7 @@

     if (a->direction > b->direction)

 	return +1;

     return 0;

-};

+}

 static struct xyd *new_xyd(int x, int y, int direction)

 {

--- a/twiddle.c

+++ b/twiddle.c

@@ -260,12 +260,12 @@

 	for (j = 0; j < n/2; j++) {

 	    int k;

 	    int g[4];

-	    int p[4] = {

-		j*w+i,

-		i*w+(n-j-1),

-		(n-j-1)*w+(n-i-1),

-		(n-i-1)*w+j

-	    };

+	    int p[4];

+            

+            p[0] = j*w+i;

+            p[1] = i*w+(n-j-1);

+            p[2] = (n-j-1)*w+(n-i-1);

+            p[3] = (n-i-1)*w+j;

 	    for (k = 0; k < 4; k++)

 		g[k] = grid[p[k]];