From c0ed527311cc9503f3f8e2d687aabe3c8605027e Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Tue, 29 Dec 2009 13:09:01 +0100
Subject: [PATCH] Consistently use int for file type parameters and locals

---
 include/lost.h          | 4 ++--
 include/prototypes.h    | 4 ++--
 src/lib/commands/look.c | 2 +-
 src/lib/commands/navi.c | 2 +-
 src/lib/commands/rada.c | 2 +-
 src/lib/commands/retr.c | 4 ++--
 src/lib/subs/lostsub.c  | 8 ++++----
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/lost.h b/include/lost.h
index d30f8e856..a7fd65428 100644
--- a/include/lost.h
+++ b/include/lost.h
@@ -56,8 +56,8 @@ struct loststr {
 
 /* src/lib/subs/lostsub.c */
 extern void lost_and_found(int, natid, natid, int, coord, coord);
-extern void makelost(short, natid, short, coord, coord);
-extern void makenotlost(short, natid, short, coord, coord);
+extern void makelost(int, natid, short, coord, coord);
+extern void makenotlost(int, natid, short, coord, coord);
 extern void delete_old_lostitems(void);
 
 #endif
diff --git a/include/prototypes.h b/include/prototypes.h
index fee4e3f65..7b1352420 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -74,8 +74,8 @@ extern char *prsub(struct shpstr *);
 extern int check_trade(void);
 extern int ontradingblock(int, void *);
 extern void trdswitchown(int, void *, int);
-extern int do_look(short);
-extern int radar(short);
+extern int do_look(int);
+extern int radar(int);
 extern void update_power(void);
 extern int show_first_tel(char *);
 /* Commands */
diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c
index f0952a3df..5be2269b9 100644
--- a/src/lib/commands/look.c
+++ b/src/lib/commands/look.c
@@ -55,7 +55,7 @@ llook(void)
 }
 
 int
-do_look(short type)
+do_look(int type)
 {
     int i;
     struct nstr_item ni;
diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index 1e2ec5d70..92754afa2 100644
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -82,7 +82,7 @@ do_unit_move(struct emp_qelem *ulist, int *together,
     char *pt = pathtaken;
     char bmap_flag;
     int ac;
-    short type;
+    int type;
 
     leader = get_leader(ulist);
     leader_uid = leader->uid;
diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index cfe6ad06e..29831ad31 100644
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -50,7 +50,7 @@ lrad(void)
 }
 
 int
-radar(short type)
+radar(int type)
 {
     char *cp;
     double tf;
diff --git a/src/lib/commands/retr.c b/src/lib/commands/retr.c
index b5b39c160..a192f1f66 100644
--- a/src/lib/commands/retr.c
+++ b/src/lib/commands/retr.c
@@ -51,7 +51,7 @@
 static char shp_rflagsc[] = "Xitshbdu";
 static char lnd_rflagsc[] = "XiXXhbXX";
 
-static int retreat(short);
+static int retreat(int);
 
 int
 retr(void)
@@ -66,7 +66,7 @@ lretr(void)
 }
 
 static int
-retreat(short type)
+retreat(int type)
 {
     char *pq, *fl;
     int nunits;
diff --git a/src/lib/subs/lostsub.c b/src/lib/subs/lostsub.c
index a2dd9d9df..aa13fb560 100644
--- a/src/lib/subs/lostsub.c
+++ b/src/lib/subs/lostsub.c
@@ -39,7 +39,7 @@
 #include "misc.h"
 #include "optlist.h"
 
-static int findlost(short, natid, short, coord, coord, int);
+static int findlost(int, natid, short, coord, coord, int);
 
 /*
  * Record item ID of type TYPE changed owner from EXOWN to OWN at X, Y.
@@ -56,7 +56,7 @@ lost_and_found(int type, natid exown, natid own, int id, coord x, coord y)
 }
 
 void
-makelost(short type, natid owner, short id, coord x, coord y)
+makelost(int type, natid owner, short id, coord x, coord y)
 {
     struct loststr lost;
     int n;
@@ -72,7 +72,7 @@ makelost(short type, natid owner, short id, coord x, coord y)
 }
 
 void
-makenotlost(short type, natid owner, short id, coord x, coord y)
+makenotlost(int type, natid owner, short id, coord x, coord y)
 {
     struct loststr lost;
     int n;
@@ -93,7 +93,7 @@ makenotlost(short type, natid owner, short id, coord x, coord y)
  * Else return -1.
  */
 static int
-findlost(short type, natid owner, short id, coord x, coord y, int free)
+findlost(int type, natid owner, short id, coord x, coord y, int free)
 {
     struct loststr lost;
     int n;
-- 
2.43.0