From 0d842c47f7b3396f233b97af0a248d4e86398f6d Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 21 May 2006 13:18:57 +0000
Subject: [PATCH] Purge the register keyword.

---
 include/prototypes.h    | 22 +++++++++++-----------
 src/lib/commands/head.c | 23 +++++++++--------------
 src/lib/commands/news.c |  6 +++---
 src/lib/commands/offe.c |  8 +++-----
 src/lib/gen/round.c     |  2 +-
 src/lib/lwp/queue.c     |  2 +-
 src/lib/player/accept.c |  2 +-
 src/lib/subs/border.c   |  4 +---
 src/lib/subs/distrea.c  |  8 +++-----
 src/lib/subs/getbit.c   |  8 ++++----
 src/lib/subs/mtch.c     |  4 ++--
 src/lib/subs/neigh.c    |  2 +-
 src/lib/subs/nreport.c  |  2 +-
 src/lib/subs/trechk.c   |  4 ++--
 src/lib/update/age.c    |  5 ++---
 15 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/include/prototypes.h b/include/prototypes.h
index ea762638..b8edba98 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -369,7 +369,7 @@ extern int onearg(char *, char *);
 extern int parse(char *, char **, char **, char *, char **);
 extern int ldround(double, int);
 extern int roundintby(int, int);
-extern int scthash(register int, register int, int);
+extern int scthash(int, int, int);
 extern int tcp_listen(char *, char *, size_t *);
 extern char *numstr(char buf[], int n);
 /* plur.c */
@@ -450,9 +450,9 @@ extern int military_control(struct sctstr *);
 /* detonate.c */
 extern int detonate(struct nukstr *, coord, coord, int);
 /* disloan.c */
-extern int disloan(int, register struct lonstr *);
+extern int disloan(int, struct lonstr *);
 /* distrea.c */
-extern int distrea(int, register struct trtstr *);
+extern int distrea(int, struct trtstr *);
 /* fileinit.c */
 extern void ef_init_srv(void);
 extern void ef_fin_srv(void);
@@ -618,9 +618,9 @@ extern int check_retreat_and_do_landdamage(struct lndstr *, int);
 /* sarg.c */
 extern ns_seltype sarg_type(char *);
 extern int sarg_xy(char *, coord *, coord *);
-extern int sarg_area(char *, register struct range *);
+extern int sarg_area(char *, struct range *);
 extern int sarg_range(char *, coord *, coord *, int *);
-extern int sarg_list(char *, register int *, int);
+extern int sarg_list(char *, int *, int);
 /* satmap.c */
 extern void satdisp(struct sctstr *, int, int);
 extern void satmap(int, int, int, int, int, int);
@@ -682,7 +682,7 @@ extern void snxtitem_group(struct nstr_item *, int, char);
 extern void snxtitem_rewind(struct nstr_item *);
 extern int snxtitem_list(struct nstr_item *, int, int *, int);
 /* snxtsct.c */
-extern int snxtsct(register struct nstr_sect *, char *);
+extern int snxtsct(struct nstr_sect *, char *);
 extern void snxtsct_area(struct nstr_sect *, struct range *);
 extern void xydist_range(coord, coord, int, struct range *);
 extern void xysize_range(struct range *);
@@ -703,7 +703,7 @@ extern void takeover_ship(struct shpstr *, natid, int);
 extern void takeover_plane(struct plnstr *, natid);
 /* trdsub.c */
 /* trechk.c */
-extern int trechk(register natid, register natid, int);
+extern int trechk(natid, natid, int);
 /* whatitem.c */
 /* in item.h */
 /* wu.c */
@@ -728,7 +728,7 @@ extern int dodistribute(struct sctstr *, int, char *, double, double);
 extern void finish_sects(int);
 /* human.c */
 extern int new_work(struct sctstr *, int);
-extern int do_feed(register struct sctstr *, register struct natstr *,
+extern int do_feed(struct sctstr *, struct natstr *,
 		   short *, int *, int *, int);
 extern int feed_people(short *, int, int *);
 /* land.c */
@@ -755,7 +755,7 @@ extern void move_sat(struct plnstr *);
 extern double logx(double, double);
 extern void prod_nat(int);
 /* nav_ship.c */
-extern int nav_ship(register struct shpstr *);
+extern int nav_ship(struct shpstr *);
 /* nav_util.c */
 extern int load_it(struct shpstr *, struct sctstr *,
 		   int);
@@ -769,7 +769,7 @@ extern int plague_people(struct natstr *, short *, int *, int *, int);
 /* plane.c */
 extern int prod_plane(int, int, int *, int);
 /* populace.c */
-extern void populace(struct natstr *, register struct sctstr *, int);
+extern void populace(struct natstr *, struct sctstr *, int);
 extern int total_work(int, int, int, int, int, int);
 /* prepare.c */
 extern void tax(struct sctstr *, struct natstr *, int, long *, int *,
@@ -789,7 +789,7 @@ extern void guerrilla(struct sctstr *);
 /* sail.c */
 extern void sail_ship(natid);
 /* sect.c */
-extern void do_fallout(register struct sctstr *, register int);
+extern void do_fallout(struct sctstr *, int);
 extern void spread_fallout(struct sctstr *, int);
 extern void decay_fallout(struct sctstr *, int);
 extern void produce_sect(int natnum, int etu, int *bp,
diff --git a/src/lib/commands/head.c b/src/lib/commands/head.c
index 6446bd65..7ccd950d 100644
--- a/src/lib/commands/head.c
+++ b/src/lib/commands/head.c
@@ -52,14 +52,13 @@ static void head_describe(struct histstr *, int, char *, char *);
 static int head_printscoop(struct histstr (*hist)[MAXNOC], natid ano,
 			   natid vno);
 static int head_findscoop(struct histstr (*hist)[MAXNOC],
-			  register natid maxcnum, natid *ano, natid *vno);
+			  natid maxcnum, natid *ano, natid *vno);
 
 int
 head(void)
 {
-    register int i;
-    register struct histstr *hp;
-    register natid maxcnum;
+    struct histstr *hp;
+    natid maxcnum;
     time_t now;
     int severity;
     int scoop;
@@ -71,7 +70,7 @@ head(void)
     natid actor;
     natid victim;
     struct nstr_item nstr;
-    int n;
+    int i, n;
 
     (void)time(&now);
     natp = getnatp(player->cnum);
@@ -126,7 +125,7 @@ head(void)
 static int
 head_printscoop(struct histstr (*hist)[MAXNOC], natid ano, natid vno)
 {
-    register struct histstr *hp;
+    struct histstr *hp;
     int severity;
 
     hp = &hist[ano][vno];
@@ -220,16 +219,12 @@ head_describe(struct histstr *hp, int what, char *aname, char *vname)
  * Pretty strange.
  */
 static int
-head_findscoop(struct histstr (*hist)[MAXNOC], register natid maxcnum,
+head_findscoop(struct histstr (*hist)[MAXNOC], natid maxcnum,
 	       natid *ano, natid *vno)
 {
-    register struct histstr *hp;
-    register int i;
-    register int j;
-    register int k;
-    int scoop;
-    natid actor;
-    natid victim;
+    struct histstr *hp;
+    int i, j, k, scoop;
+    natid actor, victim;
 
     scoop = 9;
     actor = 0;
diff --git a/src/lib/commands/news.c b/src/lib/commands/news.c
index 5444193b..7effc5bc 100644
--- a/src/lib/commands/news.c
+++ b/src/lib/commands/news.c
@@ -43,7 +43,7 @@
 #include "commands.h"
 #include "optlist.h"
 
-static void preport(register struct nwsstr *np);
+static void preport(struct nwsstr *np);
 
 int
 news(void)
@@ -174,10 +174,10 @@ news(void)
 }
 
 static void
-preport(register struct nwsstr *np)
+preport(struct nwsstr *np)
 {
     char *cp;
-    register int i;
+    int i;
     char buf[255];
     char num[128];
     char *ptr;
diff --git a/src/lib/commands/offe.c b/src/lib/commands/offe.c
index 3c804ca0..ce7a4870 100644
--- a/src/lib/commands/offe.c
+++ b/src/lib/commands/offe.c
@@ -80,15 +80,13 @@ static int
 do_treaty(void)
 {
     char *cp;
-    register int ourcond;
-    register int theircond;
-    register int j;
+    int ourcond, theircond;
     struct symbol *tfp;
     struct trtstr trty;
     struct nstr_item nstr;
     natid recipient;
     time_t now;
-    int n;
+    int j, n;
     struct natstr *natp;
     char prompt[128];
     char buf[1024];
@@ -163,7 +161,7 @@ do_treaty(void)
 static int
 do_loan(void)
 {
-    register int amt, irate, dur, maxloan;
+    int amt, irate, dur, maxloan;
     struct nstr_item nstr;
     struct natstr *natp;
     struct lonstr loan;
diff --git a/src/lib/gen/round.c b/src/lib/gen/round.c
index 2b6b4a1d..7130ab71 100644
--- a/src/lib/gen/round.c
+++ b/src/lib/gen/round.c
@@ -38,7 +38,7 @@
 int
 roundintby(int n, int m)
 {
-    register int r11;
+    int r11;
 
     r11 = (m >> 1) + n;
     return r11 / m * m;
diff --git a/src/lib/lwp/queue.c b/src/lib/lwp/queue.c
index 3b82bf95..65478d71 100644
--- a/src/lib/lwp/queue.c
+++ b/src/lib/lwp/queue.c
@@ -48,7 +48,7 @@ lwpGetFirst(struct lwpQueue *q)
 }
 
 void
-lwpAddTail(register struct lwpQueue *q, register struct lwpProc *p)
+lwpAddTail(struct lwpQueue *q, struct lwpProc *p)
 {
     if (!q->tail)
 	q->head = p;
diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index d2f8ae0e..70bc49aa 100644
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -167,7 +167,7 @@ getplayer(natid cnum)
 void
 player_wakeup_all(natid cnum)
 {
-    register struct player *lp;
+    struct player *lp;
 
     if (NULL != (lp = getplayer(cnum)))
 	player_wakeup(lp);
diff --git a/src/lib/subs/border.c b/src/lib/subs/border.c
index daba5dec..62f62f6e 100644
--- a/src/lib/subs/border.c
+++ b/src/lib/subs/border.c
@@ -44,9 +44,7 @@ border(struct range *rp, char *prefstr, char *sep)
 				/* prefixes each line */
 				/* separates the numbers */
 {
-    register int posi;
-    register int n;
-    register int x;
+    int posi, n, x;
 
     if ((WORLD_X / 2) >= 100) {
 	if (rp->lx + rp->width > 99 || rp->hx - rp->width < -99) {
diff --git a/src/lib/subs/distrea.c b/src/lib/subs/distrea.c
index 58db18d2..d0e6e2d4 100644
--- a/src/lib/subs/distrea.c
+++ b/src/lib/subs/distrea.c
@@ -41,12 +41,10 @@
 #include "prototypes.h"
 
 int
-distrea(int n, register struct trtstr *tp)
+distrea(int n, struct trtstr *tp)
 {
-    register int i;
-    int acond;
-    int bcond;
-    int cond;
+    int i;
+    int acond, bcond, cond;
     time_t now;
 
     if (tp->trt_status == TS_FREE)
diff --git a/src/lib/subs/getbit.c b/src/lib/subs/getbit.c
index 0adfd552..a66fab1f 100644
--- a/src/lib/subs/getbit.c
+++ b/src/lib/subs/getbit.c
@@ -136,7 +136,7 @@ emp_getbit(int x, int y, unsigned char *bitmap)
 void
 emp_setbit(int x, int y, unsigned char *bitmap)
 {
-    register int id;
+    int id;
 
     id = (GCFy(y)) * WORLD_X / 2 + GCFx(x) / 2;
     bitmap[id / 8] |= bit(id & 07);
@@ -145,9 +145,9 @@ emp_setbit(int x, int y, unsigned char *bitmap)
 static void
 emp_setbitmap(int x, int y, unsigned char *bitmap, int *bitmaps)
 {
-    register int *mp;
-    register int id;
-    register int dx, dy;
+    int *mp;
+    int id;
+    int dx, dy;
 
     for (mp = bitmaps; *mp != 9999;) {
 	dx = x + *mp++;
diff --git a/src/lib/subs/mtch.c b/src/lib/subs/mtch.c
index 9334ce0d..a02d5a37 100644
--- a/src/lib/subs/mtch.c
+++ b/src/lib/subs/mtch.c
@@ -48,8 +48,8 @@
 int
 comtch(char *command, struct cmndstr *coms, int comstat)
 {
-    register struct cmndstr *com;
-    register int status;
+    struct cmndstr *com;
+    int status;
 
     if (command == 0 || *command == 0)
 	return M_IGNORE;
diff --git a/src/lib/subs/neigh.c b/src/lib/subs/neigh.c
index 70450313..fec473b8 100644
--- a/src/lib/subs/neigh.c
+++ b/src/lib/subs/neigh.c
@@ -43,7 +43,7 @@
 int
 neigh(coord x, coord y, natid own)
 {
-    register int i;
+    int i;
     struct sctstr sect;
 
     for (i = DIR_FIRST; i <= DIR_LAST; i++) {
diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c
index c4def9ac..8ab80f43 100644
--- a/src/lib/subs/nreport.c
+++ b/src/lib/subs/nreport.c
@@ -154,7 +154,7 @@ init_nreport(void)
 static struct newscache *
 ncache(int actor, int event, int victim, int times)
 {
-    register struct newscache *np;
+    struct newscache *np;
     int i;
     int oldslot;
     time_t oldtime;
diff --git a/src/lib/subs/trechk.c b/src/lib/subs/trechk.c
index 4a4ab70d..6ab78d5e 100644
--- a/src/lib/subs/trechk.c
+++ b/src/lib/subs/trechk.c
@@ -52,9 +52,9 @@
 #include "optlist.h"
 
 int
-trechk(register natid actor, register natid victim, int provision)
+trechk(natid actor, natid victim, int provision)
 {
-    register natid cn;
+    natid cn;
     char buf[1024];
     int news_verb;
     int involved[MAXNOC];
diff --git a/src/lib/update/age.c b/src/lib/update/age.c
index 4739957b..8b6ee2ad 100644
--- a/src/lib/update/age.c
+++ b/src/lib/update/age.c
@@ -43,9 +43,8 @@
 void
 age_levels(int etu)
 {
-    register float best_tech;
-    register float best_res;
-    register struct natstr *np;
+    float best_tech, best_res;
+    struct natstr *np;
     int i;
     double level;
     double delta;