lint cleanup to pacify gcc

I upgraded from OSX 10.5.8 via 10.6.3 to 10.6.8, plus Xcode to whatever
version was on the 10.6 dvd, and ended up with a more recent version of
gcc that is configured to use 64 bit longs and 64 bit pointers (by
default; presumably that can be changed if necessary).  It triggered
several warnings about converting int to pointer of different size or
vice versa even when explicit casts were in use, and a couple of other
things.

diff --git a/include/lint.h b/include/lint.h
index c50446405197c7d867fa8aa1f0aa295c4cf3d9ba..b180478a110c59eee20206d0e85650ff330e084b 100644 (file)
--- a/include/lint.h
+++ b/include/lint.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6 lint.h  $NHDT-Date: 1449269910 2015/12/04 22:58:30 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.3 $ */
+/* NetHack 3.6 lint.h  $NHDT-Date: 1454571508 2016/02/04 07:38:28 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.4 $ */
 /* NetHack may be freely redistributed.  See license for details. */
 
 /*
@@ -22,7 +22,7 @@
 /* force an unused function argument to become used in an arbitrary
    manner in order to suppress warning about unused function arguments;
    viable for scalar and pointer arguments */
-#define nhUse(arg) nhUse_dummy += (unsigned) arg;
+#define nhUse(arg) nhUse_dummy += (unsigned) !(arg)
 extern unsigned nhUse_dummy;
 #else
 #define nhUse(arg) /*empty*/

diff --git a/src/end.c b/src/end.c
index b4a277b91ddf62bfd56d7bb3df90cac58f6b355f..4db37b71b5e5d5145fae717c1ec844e17bdc122a 100644 (file)
--- a/src/end.c
+++ b/src/end.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 end.c   $NHDT-Date: 1454116472 2016/01/30 01:14:32 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.113 $ */
+/* NetHack 3.6 end.c   $NHDT-Date: 1454571522 2016/02/04 07:38:42 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.114 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -182,9 +182,9 @@ NH_abort()
         gdb_prio++;
 
     if (gdb_prio > libc_prio) {
-        NH_panictrace_gdb() || (libc_prio && NH_panictrace_libc());
+        (void) (NH_panictrace_gdb() || (libc_prio && NH_panictrace_libc()));
     } else {
-        NH_panictrace_libc() || (gdb_prio && NH_panictrace_gdb());
+        (void) (NH_panictrace_libc() || (gdb_prio && NH_panictrace_gdb()));
     }
 
 #else /* VMS */

diff --git a/src/options.c b/src/options.c
index 3d1a5e34c737d714a3ed94ea45179064ebc4ab19..bdbfbbe32b7fd76921a8f68119206c4f75cfda73 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 options.c       $NHDT-Date: 1451683057 2016/01/01 21:17:37 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.249 $ */
+/* NetHack 3.6 options.c       $NHDT-Date: 1454571526 2016/02/04 07:38:46 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.262 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -4128,13 +4128,16 @@ boolean setinitial, setfromfile;
             add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
        "screen: row is offset to accommodate tty interface's use of top line",
                      MENU_UNSELECTED);
-        Sprintf(buf, "screen: upper-left: [%02d,%02d], lower-right: [%d,%d]%s",
-                0 + 2, 1, ROWNO - 1 + 2, COLNO - 1,
 #if COLNO == 80
-                flags.verbose ? "; column 80 is not used" :
+#define COL80ARG flags.verbose ? "; column 80 is not used" : ""
+#else
+#define COL80ARG ""
 #endif
-                "");
+        Sprintf(buf, "screen: upper-left: [%02d,%02d], lower-right: [%d,%d]%s",
+                0 + 2, 1, ROWNO - 1 + 2, COLNO - 1, COL80ARG);
+#undef COL80ARG
         add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, buf, MENU_UNSELECTED);
+        add_menu(tmpwin, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED);
         end_menu(tmpwin,
             "Select coordinate display when auto-describing a map position:");
         if ((pick_cnt = select_menu(tmpwin, PICK_ONE, &window_pick)) > 0) {

diff --git a/win/X11/winmisc.c b/win/X11/winmisc.c
index 04564f19cd36ff598ae0340673253f3306818320..954b6642e3297b0191153478c7f14ed6c0d3bc8c 100644 (file)
--- a/win/X11/winmisc.c
+++ b/win/X11/winmisc.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 winmisc.c       $NHDT-Date: 1454455162 2016/02/02 23:19:22 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.20 $ */
+/* NetHack 3.6 winmisc.c       $NHDT-Date: 1454571527 2016/02/04 07:38:47 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.21 $ */
 /* Copyright (c) Dean Luick, 1992                                 */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -118,7 +118,7 @@ XtPointer client_data, call_data;
     nhUse(w);
     nhUse(call_data);
 
-    ps_selected = (int) client_data;
+    ps_selected = (int) (ptrdiff_t) client_data;
     exit_x_event = TRUE; /* leave event loop */
 }
 
@@ -620,7 +620,7 @@ extend_select(w, client_data, call_data)
 Widget w;
 XtPointer client_data, call_data;
 {
-    int selected = (int) client_data;
+    int selected = (int) (ptrdiff_t) client_data;
 
     nhUse(w);
     nhUse(call_data);
@@ -1045,7 +1045,8 @@ Widget *formp; /* return */
 
         *curr = XtCreateManagedWidget(widget_names[i], commandWidgetClass,
                                       form, args, num_args);
-        XtAddCallback(*curr, XtNcallback, name_callback, (XtPointer) i);
+        XtAddCallback(*curr, XtNcallback, name_callback,
+                      (XtPointer) (ptrdiff_t) i);
         above = *curr++;
     }
     cumulative_height += distance; /* space at bottom of form */