From: Pasi Kallinen Date: Mon, 16 Mar 2020 09:46:08 +0000 (+0200) Subject: Move, rename, and comment out unused function X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=712f545119071d715ad64179660414c591dab64d;p=nethack Move, rename, and comment out unused function --- diff --git a/src/hacklib.c b/src/hacklib.c index 5d53bccbc..89905d194 100644 --- a/src/hacklib.c +++ b/src/hacklib.c @@ -73,6 +73,7 @@ void strbuf_nl_to_crlf (strbuf_t *) char * nonconst (const char *, char *) int swapbits (int, int, int) +UNUSED void shuffle_int_array (int *, int) =*/ #ifdef LINT #define Static /* pacify lint */ @@ -1301,4 +1302,23 @@ int val, bita, bitb; return (val ^ ((tmp << bita) | (tmp << bitb))); } +#if 0 +/* randomize the given list of numbers 0 <= i < count */ +static void +shuffle_int_array(indices, count) +int *indices; +int count; +{ + int i, iswap, temp; + + for (i = count - 1; i > 0; i--) { + if ((iswap = rn2(i + 1)) == i) + continue; + temp = indices[i]; + indices[i] = indices[iswap]; + indices[iswap] = temp; + } +} +#endif + /*hacklib.c*/ diff --git a/src/read.c b/src/read.c index abca909bb..18d2cfd2f 100644 --- a/src/read.c +++ b/src/read.c @@ -22,7 +22,6 @@ static char *FDECL(apron_text, (struct obj *, char *buf)); static void FDECL(stripspe, (struct obj *)); static void FDECL(p_glow1, (struct obj *)); static void FDECL(p_glow2, (struct obj *, const char *)); -static void FDECL(randomize, (int *, int)); static void FDECL(forget, (int)); static int FDECL(maybe_tame, (struct monst *, struct obj *)); static boolean FDECL(get_valid_stinking_cloud_pos, (int, int)); @@ -707,23 +706,6 @@ int curse_bless; } } -/* randomize the given list of numbers 0 <= i < count */ -static void -randomize(indices, count) -int *indices; -int count; -{ - int i, iswap, temp; - - for (i = count - 1; i > 0; i--) { - if ((iswap = rn2(i + 1)) == i) - continue; - temp = indices[i]; - indices[i] = indices[iswap]; - indices[iswap] = temp; - } -} - /* * Forget some things (e.g. after reading a scroll of amnesia). When called, * the following are always forgotten: diff --git a/src/weapon.c b/src/weapon.c index d6e5f98b6..c3deda3a4 100644 --- a/src/weapon.c +++ b/src/weapon.c @@ -1380,7 +1380,6 @@ int n; /* number of skills to drain */ int skill; int i; int tmpskills[P_NUM_SKILLS]; - int tmpidx = 0; (void) memset((genericptr_t) tmpskills, 0, sizeof(tmpskills));