From 22d64456a6ef63c425ee3387f601339a9fb16b7c Mon Sep 17 00:00:00 2001 From: nhkeni Date: Fri, 29 Mar 2024 13:45:27 -0400 Subject: [PATCH] staticfn followup --- src/artifact.c | 4 ++-- src/end.c | 6 +++--- src/muse.c | 6 +++--- src/role.c | 30 +++++++++++++++--------------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/artifact.c b/src/artifact.c index 1e65131cd..eb9a3b335 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 artifact.c $NHDT-Date: 1702064500 2023/12/08 19:41:40 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.214 $ */ +/* NetHack 3.7 artifact.c $NHDT-Date: 1711734229 2024/03/29 17:43:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.230 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -14,7 +14,7 @@ * the contents, just the total size. */ -static struct artifact *get_artifact(struct obj *) NONNULL; /* never returns null */ +staticfn struct artifact *get_artifact(struct obj *) NONNULL; /* never returns null */ /* #define get_artifact(o) \ (((o) && ((o)->artifact > 0 && (o)->artifact < AFTER_LAST_ARTIFACT)) \ diff --git a/src/end.c b/src/end.c index f42e53401..60217226f 100644 --- a/src/end.c +++ b/src/end.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 end.c $NHDT-Date: 1709597568 2024/03/05 00:12:48 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.305 $ */ +/* NetHack 3.7 end.c $NHDT-Date: 1711734217 2024/03/29 17:43:37 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.312 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -816,11 +816,11 @@ sort_valuables( * odds_and_ends() was used for 3.6.0 and 3.6.1. * Schroedinger's Cat is handled differently as of 3.6.2. */ -static boolean odds_and_ends(struct obj *, int); +staticfn boolean odds_and_ends(struct obj *, int); #define CAT_CHECK 2 -static boolean +staticfn boolean odds_and_ends(struct obj *list, int what) { struct obj *otmp; diff --git a/src/muse.c b/src/muse.c index b1d5e97c5..2fc1ed083 100644 --- a/src/muse.c +++ b/src/muse.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 muse.c $NHDT-Date: 1702356860 2023/12/12 04:54:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.203 $ */ +/* NetHack 3.7 muse.c $NHDT-Date: 1711734229 2024/03/29 17:43:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.216 $ */ /* Copyright (C) 1990 by Ken Arromdee */ /* NetHack may be freely redistributed. See license for details. */ @@ -35,7 +35,7 @@ staticfn struct permonst *muse_newcham_mon(struct monst *); staticfn int mloot_container(struct monst *mon, struct obj *, boolean); staticfn void you_aggravate(struct monst *); #if 0 -static boolean necrophiliac(struct obj *, boolean); +staticfn boolean necrophiliac(struct obj *, boolean); #endif staticfn void mon_consume_unstone(struct monst *, struct obj *, boolean, boolean); @@ -2561,7 +2561,7 @@ rnd_misc_item(struct monst *mtmp) #if 0 /* check whether hero is carrying a corpse or contained petrifier corpse */ -static boolean +staticfn boolean necrophiliac(struct obj *objlist, boolean any_corpse) { while (objlist) { diff --git a/src/role.c b/src/role.c index 608086965..b5ec9ef74 100644 --- a/src/role.c +++ b/src/role.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 role.c $NHDT-Date: 1701132222 2023/11/28 00:43:42 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.94 $ */ +/* NetHack 3.7 role.c $NHDT-Date: 1711734229 2024/03/29 17:43:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.100 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985-1999. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2176,13 +2176,13 @@ genl_player_selection(void) #if defined(TTY_GRAPHICS) || defined(CURSES_GRAPHICS) /* ['#else' far below] */ -static boolean reset_role_filtering(void); -static winid plsel_startmenu(int, int); -static int maybe_skip_seps(int, int); -static void setup_rolemenu(winid, boolean, int, int, int); -static void setup_racemenu(winid, boolean, int, int, int); -static void setup_gendmenu(winid, boolean, int, int, int); -static void setup_algnmenu(winid, boolean, int, int, int); +staticfn boolean reset_role_filtering(void); +staticfn winid plsel_startmenu(int, int); +staticfn int maybe_skip_seps(int, int); +staticfn void setup_rolemenu(winid, boolean, int, int, int); +staticfn void setup_racemenu(winid, boolean, int, int, int); +staticfn void setup_gendmenu(winid, boolean, int, int, int); +staticfn void setup_algnmenu(winid, boolean, int, int, int); /* try to reduce clutter in the code below... */ #define ROLE flags.initrole @@ -2708,7 +2708,7 @@ genl_player_setup(int screenheight) return result; } -static boolean +staticfn boolean reset_role_filtering(void) { winid win; @@ -2757,7 +2757,7 @@ reset_role_filtering(void) tty-only to tty+curses+? made the role selection menu require two pages on a traditional 24-line tty; that wasn't fair to tty, so squeeze out some blank separator lines from the menu if that will make it fit on one */ -static int +staticfn int maybe_skip_seps(int rows, int aspect) { int i, n = 0; @@ -2786,7 +2786,7 @@ maybe_skip_seps(int rows, int aspect) } /* start a menu; show role aspects specified so far as a header line */ -static winid +staticfn winid plsel_startmenu(int ttyrows, int aspect) { char qbuf[QBUFSZ]; @@ -2834,7 +2834,7 @@ plsel_startmenu(int ttyrows, int aspect) #undef ALGN /* add entries a-Archeologist, b-Barbarian, &c to menu being built in 'win' */ -static void +staticfn void setup_rolemenu( winid win, boolean filtering, /* True => exclude filtered roles; @@ -2885,7 +2885,7 @@ setup_rolemenu( } } -static void +staticfn void setup_racemenu( winid win, boolean filtering, @@ -2923,7 +2923,7 @@ setup_racemenu( } } -static void +staticfn void setup_gendmenu( winid win, boolean filtering, @@ -2959,7 +2959,7 @@ setup_gendmenu( } } -static void +staticfn void setup_algnmenu( winid win, boolean filtering,