From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 25 Aug 2013 19:09:17 +0000 (-0400)
Subject: Some varargs-cleanup remnants.
X-Git-Tag: 1.11~13
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=714d5f43a4b527701069887cbd4f16ca78c77fc1;p=vms-empire.git

Some varargs-cleanup remnants.
---

diff --git a/display.c b/display.c
index 590dc7f..debf257 100644
--- a/display.c
+++ b/display.c
@@ -282,13 +282,14 @@ print_sector(int whose, view_map_t vmap[], int sector)
     /* print x-coordinates along bottom of screen */
     for (c = ref_col; c < ref_col + display_cols && c < MAP_WIDTH; c++)
 	if (c % 10 == 0) {
-	    pos_str (lines-1, c-ref_col, "%d", c,0,0,0,0,0,0,0);
+	    pos_str (lines-1, c-ref_col, "%d", c);
 	}
     /* print y-coordinates along right of screen */
     for (r = ref_row; r < ref_row + display_rows && r < MAP_HEIGHT; r++) {
 	if (r % 2 == 0)
-	    pos_str (r-ref_row+NUMTOPS, cols-NUMSIDES+1, "%2d", r,0,0,0,0,0,0,0);
-	else pos_str (r-ref_row+NUMTOPS, cols-NUMSIDES+1, "  ",0,0,0,0,0,0,0,0);
+	    pos_str (r-ref_row+NUMTOPS, cols-NUMSIDES+1, "%2d", r);
+	else
+	    pos_str (r-ref_row+NUMTOPS, cols-NUMSIDES+1, "  ");
     }
     /* print round number */
     (void) sprintf (jnkbuf, "Sector %d Round %ld", sector, date);
@@ -450,7 +451,7 @@ print_zoom(view_map_t *vmap)
 	for (c = 0; c < MAP_WIDTH; c += col_inc)
 	    print_zoom_cell (vmap, r, c, row_inc, col_inc);
 
-    pos_str (0, 0, "Round #%d", date,0,0,0,0,0,0,0);
+    pos_str (0, 0, "Round #%d", date);
 	
     (void) refresh ();
 }
@@ -687,19 +688,6 @@ pos_str(int row, int col, char *str, ...)
     va_end(ap);
 }
 
-void
-pos_str1(int row, int col, char *str, ...)
-{
-    va_list ap;
-    char junkbuf[STRSIZE];
-
-    va_start(ap, str);
-    (void) move (row, col);
-    vsprintf(junkbuf, str, ap);
-    (void) addstr (junkbuf);
-    va_end(ap);
-}
-
 /*
 Print a single cell in condensed format.
 */
diff --git a/extern.h b/extern.h
index 6e3a433..d02ff99 100644
--- a/extern.h
+++ b/extern.h
@@ -161,7 +161,6 @@ void complain (void);
 void delay (void);
 void close_disp (void);
 void pos_str (int row, int col, char *str, ...);
-void pos_str1 (int row, int col, char *str, ...);
 int direction();
 
 void init_game (void); /* game routines */
diff --git a/term.c b/term.c
index 4af79c6..1b4399a 100644
--- a/term.c
+++ b/term.c
@@ -389,7 +389,7 @@ help(char **text, int nlines)
 	    r = i;
 	    c = 1;
 	}
-	pos_str1 (r + text_lines + NUMTOPS + 3, c,"%-12s%c     %c%6d%5d%6d",
+	pos_str (r + text_lines + NUMTOPS + 3, c,"%-12s%c     %c%6d%5d%6d",
 		  piece_attr[i].nickname,
 		  piece_attr[i].sname,
 		  tolower (piece_attr[i].sname),
diff --git a/usermove.c b/usermove.c
index db2e888..7189bb1 100644
--- a/usermove.c
+++ b/usermove.c
@@ -942,7 +942,7 @@ user_dir_ship(piece_info_t *obj, loc_t loc)
     }
 
     else if (map[loc].contents == '+') { /* moving ashore? */
-	ool enemy_killed = false;
+	bool enemy_killed = false;
 
 	if (!getyn ("Ships need sea to float, sir.  Do you really want to go ashore? ")) return;