spider/slack-diff+small-fixes.patch

   1 diff -Naur spider.orig/defs.h spider/defs.h
   2 --- spider.orig/defs.h  1991-09-28 19:46:21.000000000 +0200
   3 +++ spider/defs.h       2011-08-20 03:21:42.411243136 +0200
   4 @@ -17,6 +17,7 @@
   5  #include       <X11/Xutil.h>
   6  #include       <X11/Xos.h>
   7  #include       <stdio.h>
   8 +#include       <stdlib.h>
   9  #include       "assert.h"
  10  #include       "copyright.h"
  11
  12 @@ -31,7 +32,7 @@
  13
  14  typedef enum   {Faceup, Facedown, Joker}       Type;
  15
  16 -#else DEBUG
  17 +#else /* DEBUG */
  18
  19  typedef        char    Suit;
  20  typedef        char    Rank;
  21 @@ -60,7 +61,7 @@
  22  #define        Facedown        1
  23  #define        Joker           2
  24
  25 -#endif DEBUG
  26 +#endif /* DEBUG */
  27
  28  #define        NUM_DECKS       2
  29  #define        NUM_PILES       8
  30 diff -Naur spider.orig/gfx.c spider/gfx.c
  31 --- spider.orig/gfx.c   1991-09-28 19:46:10.000000000 +0200
  32 +++ spider/gfx.c        2011-08-20 04:07:56.200657689 +0200
  33 @@ -166,7 +166,7 @@
  34         gcflags |= GCFont;
  35
  36         textgc = XCreateGC(dpy, RootWindow(dpy, screen), gcflags, &gcv);
  37 -#endif KITLESS
  38 +#endif /* KITLESS */
  39
  40         tmpmap = XCreateBitmapFromData(dpy, RootWindow(dpy, screen),
  41                 logo_bits, logo_width, logo_height);
  42 @@ -1321,7 +1321,7 @@
  43         XDrawImageString(dpy, message_win, textgc, MESSAGE_X, message_y,
  44                 last_message, strlen(last_message));
  45  }
  46 -#endif KITLESS
  47 +#endif /* KITLESS */
  48
  49  void
  50  card_message(str, card)
  51 diff -Naur spider.orig/globals.h spider/globals.h
  52 --- spider.orig/globals.h       1991-09-28 19:46:20.000000000 +0200
  53 +++ spider/globals.h    2011-08-20 03:18:35.033442225 +0200
  54 @@ -90,12 +90,12 @@
  55  void   button_press();
  56  void   button_release();
  57  void   do_expand();
  58 -#endif KITLESS
  59 +#endif /* KITLESS */
  60
  61  #ifdef XAW
  62  Bool   can_get_help_files();
  63  #endif
  64
  65 -extern char    *malloc();
  66 -extern char    *calloc();
  67 -extern char    *realloc();
  68 +extern void    *malloc();
  69 +extern void    *calloc();
  70 +extern void    *realloc();
  71 diff -Naur spider.orig/movelog.c spider/movelog.c
  72 --- spider.orig/movelog.c       1991-09-28 19:46:17.000000000 +0200
  73 +++ spider/movelog.c    2011-08-20 03:22:50.550140339 +0200
  74 @@ -33,6 +33,21 @@
  75
  76  extern int     cheat_count;
  77
  78 +Rank   flip_ranks[NUM_RANKS] = {
  79 +       King, Queen, Jack, Ten, Nine, Eight, Seven,
  80 +       Six, Five, Four, Three, Deuce, Ace
  81 +};
  82 +
  83 +static int
  84 +card_to_int(card)
  85 +CardPtr        card;
  86 +{
  87 +int    val;
  88 +
  89 +       val = card->suit * 13 + flip_ranks[card->rank];
  90 +       return (val);
  91 +}
  92 +
  93  make_deck_cache()
  94  {
  95  CardPtr        tmp;
  96 @@ -280,11 +295,6 @@
  97         }
  98  }
  99
 100 -Rank   flip_ranks[NUM_RANKS] = {
 101 -       King, Queen, Jack, Ten, Nine, Eight, Seven,
 102 -       Six, Five, Four, Three, Deuce, Ace
 103 -};
 104 -
 105  static void
 106  int_to_card(val, suit, rank)
 107  int    val;
 108 @@ -298,16 +308,6 @@
 109         assert (*rank >= Ace && *suit <= King);
 110  }
 111
 112 -static int
 113 -card_to_int(card)
 114 -CardPtr        card;
 115 -{
 116 -int    val;
 117 -
 118 -       val = card->suit * 13 + flip_ranks[card->rank];
 119 -       return (val);
 120 -}
 121 -
 122  static CardPtr
 123  find_card(cache, suit, rank)
 124  CardPtr        *cache;
 125 @@ -709,6 +709,23 @@
 126         }
 127  }
 128
 129 +static int
 130 +restore_game(str, str2)
 131 +char   *str, *str2;
 132 +{
 133 +
 134 +       if (read_position(str) != 0)    {
 135 +               return (-1);
 136 +       }
 137 +
 138 +       init_cache();           /* clear out the move cache */
 139 +
 140 +       if (str2)
 141 +               read_moves(str2);
 142 +
 143 +       return (0);
 144 +}
 145 +
 146  read_selection(buf)
 147  char   *buf;
 148  {
 149 @@ -786,23 +803,6 @@
 150         show_message(buf);
 151  }
 152
 153 -static int
 154 -restore_game(str, str2)
 155 -char   *str, *str2;
 156 -{
 157 -
 158 -       if (read_position(str) != 0)    {
 159 -               return (-1);
 160 -       }
 161 -
 162 -       init_cache();           /* clear out the move cache */
 163 -
 164 -       if (str2)
 165 -               read_moves(str2);
 166 -
 167 -       return (0);
 168 -}
 169 -
 170  /*
 171   * play the same deck again
 172   */
 173 diff -Naur spider.orig/spider.c spider/spider.c
 174 --- spider.orig/spider.c        1991-09-28 19:46:12.000000000 +0200
 175 +++ spider/spider.c     2011-08-20 04:19:23.259260596 +0200
 176 @@ -619,7 +619,7 @@
 177
 178         return (type_names[type]);
 179  }
 180 -#endif DEBUG
 181 +#endif /* DEBUG */
 182
 183
 184  /*
 185 diff -Naur spider.orig/windows.c spider/windows.c
 186 --- spider.orig/windows.c       1991-09-28 19:46:15.000000000 +0200
 187 +++ spider/windows.c    2011-08-20 03:23:34.517277892 +0200
 188 @@ -116,7 +116,7 @@
 189         XMapWindow(dpy, message_win);
 190         XMapWindow(dpy, table);
 191  }
 192 -#endif KITLESS
 193 +#endif /* KITLESS */
 194
 195  #ifndef        KITLESS
 196  table_init(win)
 197 @@ -140,4 +140,4 @@
 198          }
 199          XChangeWindowAttributes(dpy, table, winmask, &winattr);
 200  }
 201 -#endif KITLESS
 202 +#endif /* KITLESS */
 203 diff -Naur spider.orig/xaw_ui.c spider/xaw_ui.c
 204 --- spider.orig/xaw_ui.c        1991-09-28 19:46:51.000000000 +0200
 205 +++ spider/xaw_ui.c     2011-08-20 04:03:09.000000000 +0200
 206 @@ -429,30 +429,25 @@
 207         confirm_box = XtCreatePopupShell("prompt", transientShellWidgetClass,
 208                 toplevel, args, n);
 209
 210 -       n = 0;
 211         confirmpane = XtCreateManagedWidget("confirmbox", panedWidgetClass,
 212                 confirm_box, args, n);
 213
 214 -       n = 0;
 215         XtSetArg(args[n], XtNshowGrip, False);  n++;
 216         confirm_label = XtCreateManagedWidget("confirmlabel", labelWidgetClass,
 217                 confirmpane, args, n);
 218
 219 -       n = 0;
 220         XtSetArg(args[n], XtNshowGrip, False);  n++;
 221         XtSetArg(args[n], XtNorientation, XtorientHorizontal);  n++;
 222         confirmbox = XtCreateManagedWidget("confirmbox", boxWidgetClass,
 223                 confirmpane, args, n);
 224
 225 -       n = 0;
 226         button = XtCreateManagedWidget("confirmok", commandWidgetClass,
 227                 confirmbox, args, n);
 228 -       XtAddCallback(button, XtNcallback, confirm_callback, 1);
 229 +       XtAddCallback(button, XtNcallback, confirm_callback, (int *) 1);
 230
 231 -       n = 0;
 232         button = XtCreateManagedWidget("confirmcancel", commandWidgetClass,
 233                 confirmbox, args, n);
 234 -       XtAddCallback(button, XtNcallback, confirm_callback, 2);
 235 +       XtAddCallback(button, XtNcallback, confirm_callback, (int *) 2);
 236  }
 237
 238
 239 @@ -489,66 +484,54 @@
 240  {
 241  Widget help, helpbox, helpform, helpview;
 242  Widget button;
 243 -int    n;
 244 +int    n = 0;
 245  Arg    args[10];
 246
 247 -       n = 0;
 248         help = XtCreatePopupShell("Spider Help", topLevelShellWidgetClass,
 249                 toplevel, args, n);
 250
 251 -       n = 0;
 252         helpbox = XtCreateManagedWidget("helpbox", panedWidgetClass,
 253                 help, args, n);
 254
 255 -       n = 0;
 256         XtSetArg(args[n], XtNshowGrip, False);  n++;
 257         XtSetArg(args[n], XtNorientation, XtorientHorizontal);  n++;
 258         helpform = XtCreateManagedWidget("helpform", boxWidgetClass,
 259                 helpbox, args, n);
 260
 261 -       n = 0;
 262         button = XtCreateManagedWidget("helpintro", commandWidgetClass,
 263                 helpform, args, n);
 264 -       XtAddCallback(button, XtNcallback, change_help, 1);
 265 +       XtAddCallback(button, XtNcallback, change_help, (int *) 1);
 266
 267 -       n = 0;
 268         button = XtCreateManagedWidget("helprules", commandWidgetClass,
 269                 helpform, args, n);
 270 -       XtAddCallback(button, XtNcallback, change_help, 2);
 271 +       XtAddCallback(button, XtNcallback, change_help, (int *) 2);
 272
 273 -       n = 0;
 274         button = XtCreateManagedWidget("helpcontrols", commandWidgetClass,
 275                 helpform, args, n);
 276 -       XtAddCallback(button, XtNcallback, change_help, 3);
 277 +       XtAddCallback(button, XtNcallback, change_help, (int *) 3);
 278
 279 -       n = 0;
 280         button = XtCreateManagedWidget("helpexamples", commandWidgetClass,
 281                 helpform, args, n);
 282 -       XtAddCallback(button, XtNcallback, change_help, 4);
 283 +       XtAddCallback(button, XtNcallback, change_help, (int *) 4);
 284
 285 -       n = 0;
 286         button = XtCreateManagedWidget("helpmisc", commandWidgetClass,
 287                 helpform, args, n);
 288 -       XtAddCallback(button, XtNcallback, change_help, 5);
 289 +       XtAddCallback(button, XtNcallback, change_help, (int *) 5);
 290
 291 -       n = 0;
 292         button = XtCreateManagedWidget("helpsummary", commandWidgetClass,
 293                 helpform, args, n);
 294 -       XtAddCallback(button, XtNcallback, change_help, 6);
 295 +       XtAddCallback(button, XtNcallback, change_help, (int *) 6);
 296
 297 -       n = 0;
 298         button = XtCreateManagedWidget("helpexit", commandWidgetClass,
 299                 helpform, args, n);
 300 -       XtAddCallback(button, XtNcallback, change_help, 7);
 301 +       XtAddCallback(button, XtNcallback, change_help, (int *) 7);
 302
 303 -       n = 0;
 304         XtSetArg(args[n], XtNshowGrip, False);  n++;
 305         XtSetArg(args[n], XtNallowHoriz, True); n++;
 306         XtSetArg(args[n], XtNallowVert, True);  n++;
 307         helpview = XtCreateManagedWidget("helpview", viewportWidgetClass,
 308                 helpbox, args, n);
 309
 310 -       n = 0;
 311         XtSetArg(args[n], XtNheight, 300);      n++;
 312         XtSetArg(args[n], XtNwidth, 550);       n++;
 313         XtSetArg(args[n], XtNtype, XawAsciiFile);       n++;