changeset 308:13b482bd9e66

Fix a few more miscellaneous compiler warnings.
author John "Elwin" Edwards
date Sat, 01 May 2021 09:51:30 -0400
parents 32bc72dcbf4f
children 11aeff9acc07
files arogue7/passages.c srogue/passages.c urogue/dict.c urogue/dict.h urogue/dictutil.c urogue/dictutil.h urogue/memory.c urogue/newlvl.c urogue/verify.c xrogue/network.h xrogue/rip.c
diffstat 11 files changed, 6 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/arogue7/passages.c	Fri Apr 30 20:48:30 2021 -0400
+++ b/arogue7/passages.c	Sat May 01 09:51:30 2021 -0400
@@ -216,7 +216,10 @@
 	offset = abs(spos.y - epos.y);
     }
     else
+    {
 	debug("error in connection tables");
+	return;
+    }
 
     /*
      * Draw in the doors on either side of the passage or just put #'s
--- a/srogue/passages.c	Fri Apr 30 20:48:30 2021 -0400
+++ b/srogue/passages.c	Sat May 01 09:51:30 2021 -0400
@@ -199,6 +199,7 @@
 	}
 	else {
 		msg("Error in connection tables.");
+		return;
 	}
 	/*
 	 * Draw in the doors on either side of the passage
--- a/urogue/dict.c	Fri Apr 30 20:48:30 2021 -0400
+++ b/urogue/dict.c	Sat May 01 09:51:30 2021 -0400
@@ -21,8 +21,6 @@
 **
 ******************/
 
-static char sccsid[] = "%W% %G%";
-
 #include <stdlib.h>
 #include <string.h>
 #if !defined(OS2) && !defined(_WIN32)
--- a/urogue/dict.h	Fri Apr 30 20:48:30 2021 -0400
+++ b/urogue/dict.h	Sat May 01 09:51:30 2021 -0400
@@ -18,8 +18,6 @@
 #ifndef dict_h_included
 #define dict_h_included
 
-static char dict_sccsid[] = "%W% %G%";
-
 #ifndef TRUE
 #define TRUE    1
 #define FALSE   0
--- a/urogue/dictutil.c	Fri Apr 30 20:48:30 2021 -0400
+++ b/urogue/dictutil.c	Sat May 01 09:51:30 2021 -0400
@@ -12,8 +12,6 @@
 **   Utilities for Dictionary Maintenence Functions
 *************************************************************************/
 
-static char sccsid[] = "%W% %G%";
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
--- a/urogue/dictutil.h	Fri Apr 30 20:48:30 2021 -0400
+++ b/urogue/dictutil.h	Sat May 01 09:51:30 2021 -0400
@@ -15,8 +15,6 @@
 #ifndef dictutil_h_included
 #define dictutil_h_included
 
-static char dictutil_sccsid[] = "%W% %G%";
-
 #include <stdio.h>
 #include "dict.h"
 
--- a/urogue/memory.c	Fri Apr 30 20:48:30 2021 -0400
+++ b/urogue/memory.c	Sat May 01 09:51:30 2021 -0400
@@ -19,8 +19,6 @@
 #include "config.h"
 #endif
 
-static char sccsid[] = "%W%\t%G%";
-
 /*	Debugging memory allocation code that tries to trap common memory problems
 	like overwriting storage and stepping on memory pointer chains. If code
 	doesn't use malloc, free, and realloc a lot, these routines can be left in
--- a/urogue/newlvl.c	Fri Apr 30 20:48:30 2021 -0400
+++ b/urogue/newlvl.c	Sat May 01 09:51:30 2021 -0400
@@ -37,7 +37,6 @@
     struct linked_list  *item, *nitem;
     struct thing    *tp;
     struct linked_list  *fpack = NULL;
-    int     going_down = TRUE;
     coord   stairs;
 
     /* Start player off right */
@@ -51,8 +50,6 @@
 
     if (level >= max_level)
         max_level = level;
-    else
-        going_down = FALSE;
 
     /* Free up the monsters on the last level */
 
--- a/urogue/verify.c	Fri Apr 30 20:48:30 2021 -0400
+++ b/urogue/verify.c	Sat May 01 09:51:30 2021 -0400
@@ -6,8 +6,6 @@
     All rights reserved.
 */
 
-static char sccsid[] = "%W% %G%";
-
 #include "rogue.h"
 
 void verify_function(const char *file, const int line)
--- a/xrogue/network.h	Fri Apr 30 20:48:30 2021 -0400
+++ b/xrogue/network.h	Sat May 01 09:51:30 2021 -0400
@@ -21,7 +21,6 @@
 
 /* #undef  NETCOMMAND "uux - -n '%s!%s -u' >/dev/null 2>&1" */
 /* #define NETCOMMAND "usend -s -d%s -uNoLogin -!'%s -u' - 2>/dev/null" */
-#define NETCOMMAND ""
 
 /* Networking information -- should not vary among networking machines */
 
--- a/xrogue/rip.c	Fri Apr 30 20:48:30 2021 -0400
+++ b/xrogue/rip.c	Sat May 01 09:51:30 2021 -0400
@@ -420,6 +420,7 @@
                     (flags == WINNER) ? (short) max_level : (short) level,
                     monst, player.t_ctype, thissys, login)
                 ) {
+#ifdef NETCOMMAND
                 /* Send this update to the other systems in the network */
                 int i, j;
                 char cmd[256];  /* Command for remote execution */
@@ -472,6 +473,7 @@
                             (void) pclose(rmf);
                         }
                     }
+#endif
             }
         }
     }