From 3c227928f96739da02e16c53460c2bcdedddf2e2 Mon Sep 17 00:00:00 2001
From: "nethack.allison" <nethack.allison>
Date: Mon, 12 Aug 2002 22:24:05 +0000
Subject: [PATCH] function name format

From <Someone>:
[functions that don't start in leftmost column ]

apply.c:int unfixable_trouble_count(is_horn)
artifact.c:void arti_speak(obj)
botl.c:int xlev_to_rank(xlev)
botl.c:int rank_to_xlev(rank)
display.c:void map_location(x,y,show)
hack.c:static void findtravelpath()
hack.c:void unmul(msg_override)
hack.c:long money_cnt(otmp)
mklev.c:CFDECLSPEC do_comp(vx,vy)
pickup.c:long carry_count(obj, container, count, telekinesis, wt_before, wt_after)
pickup.c:boolean mon_beside(x,y)
shk.c:long money2mon(mon, amount)
shk.c:boolean same_price(obj1, obj2)
shk.c:void finish_paybill()
trap.c:boolean delfloortrap(ttmp)
weapon.c:void give_may_advance_msg(skill)
do_name.c:char *coyotename(mtmp, buf)

(This with a pruned 'egrep '^[[:alnum:]]+ .*\(.*\)$' *.c' in src/; I
haven't looked outside that directory, but generally speaking once you
go beyond there you're widening your search anyway.)
---
 src/apply.c    | 3 ++-
 src/artifact.c | 3 ++-
 src/botl.c     | 6 ++++--
 src/display.c  | 3 ++-
 src/do_name.c  | 3 ++-
 src/hack.c     | 6 ++++--
 src/mklev.c    | 4 ++--
 src/pickup.c   | 8 ++++----
 src/shk.c      | 9 ++++++---
 src/trap.c     | 3 ++-
 src/weapon.c   | 4 ++--
 11 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/apply.c b/src/apply.c
index 4a62a67eb..e9ea15edb 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -2950,7 +2950,8 @@ doapply()
 /* Keep track of unfixable troubles for purposes of messages saying you feel
  * great.
  */
-int unfixable_trouble_count(is_horn)
+int
+unfixable_trouble_count(is_horn)
 	boolean is_horn;
 {
 	int unfixable_trbl = 0;
diff --git a/src/artifact.c b/src/artifact.c
index a90aff725..d93944ca3 100644
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -1329,7 +1329,8 @@ artifact_light(obj)
 }
 
 /* KMH -- Talking artifacts are finally implemented */
-void arti_speak(obj)
+void
+arti_speak(obj)
     struct obj *obj;
 {
 	register const struct artifact *oart = get_artifact(obj);
diff --git a/src/botl.c b/src/botl.c
index 1c2d7cd76..4934572f5 100644
--- a/src/botl.c
+++ b/src/botl.c
@@ -45,7 +45,8 @@ STATIC_DCL const char *NDECL(rank);
 #ifdef OVL1
 
 /* convert experience level (1..30) to rank index (0..8) */
-int xlev_to_rank(xlev)
+int
+xlev_to_rank(xlev)
 int xlev;
 {
 	return (xlev <= 2) ? 0 : (xlev <= 30) ? ((xlev + 2) / 4) : 8;
@@ -53,7 +54,8 @@ int xlev;
 
 #if 0	/* not currently needed */
 /* convert rank index (0..8) to experience level (1..30) */
-int rank_to_xlev(rank)
+int
+rank_to_xlev(rank)
 int rank;
 {
 	return (rank <= 0) ? 1 : (rank <= 8) ? ((rank * 4) - 2) : 30;
diff --git a/src/display.c b/src/display.c
index bad6aa7f9..ae48324bb 100644
--- a/src/display.c
+++ b/src/display.c
@@ -331,7 +331,8 @@ unmap_object(x, y)
 	map_background(x,y,show);					\
 }
 
-void map_location(x,y,show)
+void
+map_location(x,y,show)
     int x, y, show;
 {
     _map_location(x,y,show);
diff --git a/src/do_name.c b/src/do_name.c
index 1d439433e..32b7eaac7 100644
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -1005,7 +1005,8 @@ static const char *coynames[] = {
 	"Nemesis Riduclii","Canis latrans"
 };
 	
-char *coyotename(mtmp, buf)
+char *
+coyotename(mtmp, buf)
 struct monst *mtmp;
 char *buf;
 {
diff --git a/src/hack.c b/src/hack.c
index 377396733..85c3811fd 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -2001,7 +2001,8 @@ nomul(nval)
 }
 
 /* called when a non-movement, multi-turn action has completed */
-void unmul(msg_override)
+void
+unmul(msg_override)
 const char *msg_override;
 {
 	multi = 0;	/* caller will usually have done this already */
@@ -2211,7 +2212,8 @@ inv_cnt()
 /* Intended use is for your or some monsters inventory, */
 /* now that u.gold/m.gold is gone.*/
 /* Counting money in a container might be possible too. */
-long money_cnt(otmp)
+long
+money_cnt(otmp)
 struct obj *otmp;
 {
         while(otmp) {
diff --git a/src/mklev.c b/src/mklev.c
index de12c110d..4ce1294fa 100644
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -55,8 +55,8 @@ static boolean made_branch;	/* used only during level creation */
 
 /* Args must be (const genericptr) so that qsort will always be happy. */
 
-STATIC_PTR int
-CFDECLSPEC do_comp(vx,vy)
+STATIC_PTR int CFDECLSPEC
+do_comp(vx,vy)
 const genericptr vx;
 const genericptr vy;
 {
diff --git a/src/pickup.c b/src/pickup.c
index 3225a5d99..c6feb9599 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -906,8 +906,8 @@ int qflags;
 }
 
 /* could we carry `obj'? if not, could we carry some of it/them? */
-STATIC_OVL
-long carry_count(obj, container, count, telekinesis, wt_before, wt_after)
+STATIC_OVL long
+carry_count(obj, container, count, telekinesis, wt_before, wt_after)
 struct obj *obj, *container;	/* object to pick up, bag it's coming out of */
 long count;
 boolean telekinesis;
@@ -1387,8 +1387,8 @@ int x, y;
 	return TRUE;
 }
 
-STATIC_OVL
-boolean mon_beside(x,y)
+STATIC_OVL boolean
+mon_beside(x,y)
 int x, y;
 {
 	int i,j,nx,ny;
diff --git a/src/shk.c b/src/shk.c
index 3aed69525..caf38a3c7 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -88,7 +88,8 @@ static boolean FDECL(rob_shop, (struct monst *));
     Returns the amount actually paid, so we can know
     if the monster kept the change.
  */
-long money2mon(mon, amount)
+long
+money2mon(mon, amount)
 struct monst *mon;
 long amount;
 {
@@ -615,7 +616,8 @@ register char *enterstring;
    making sure they're unpaid and the same type of object; we check the price
    quoted by the shopkeeper and also that they both belong to the same shk.
  */
-boolean same_price(obj1, obj2)
+boolean
+same_price(obj1, obj2)
 struct obj *obj1, *obj2;
 {
 	register struct monst *shkp1, *shkp2;
@@ -1734,7 +1736,8 @@ struct eshk *eshkp;
 }
 
 /* called at game exit, after inventory disclosure but before making bones */
-void finish_paybill()
+void
+finish_paybill()
 {
 	register struct obj *otmp;
 	int ox = repo_location.x,
diff --git a/src/trap.c b/src/trap.c
index ce4da4cd2..5962ce5a2 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -3543,7 +3543,8 @@ register struct trap *trap;
 	dealloc_trap(trap);
 }
 
-boolean delfloortrap(ttmp)
+boolean
+delfloortrap(ttmp)
 register struct trap *ttmp;
 {
 	/* Destroy a trap that emanates from the floor. */
diff --git a/src/weapon.c b/src/weapon.c
index 885304b8c..638146bd6 100644
--- a/src/weapon.c
+++ b/src/weapon.c
@@ -78,8 +78,8 @@ STATIC_VAR NEARDATA const char *barehands_or_martial[] = {
     "bare handed combat", "martial arts"
 };
 
-STATIC_OVL
-void give_may_advance_msg(skill)
+STATIC_OVL void
+give_may_advance_msg(skill)
 int skill;
 {
 	You_feel("more confident in your %sskills.",