nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

makedefs revision

Browse Source 
This started out as fix for a comment but ended up redoing 'limit()'
and its 'temp[]' because they seemed likely to someday interfere with
other uses of such generic names.

No change to observable behavior.
This commit is contained in:
PatR
2022-01-05 12:50:21 -08:00
parent 66368d7ea2
commit 7205d9a417
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
util/makedefs.c
View File

@@ -158,7 +158,7 @@ static void opt_out_words(char *, int *);
static char *fgetline(FILE*); static char *fgetline(FILE*);
static char *tmpdup(const char *); static char *tmpdup(const char *);
static char *limit(char *, int); static char *macronamelimit(char *, int);
static void windowing_sanity(void); static void windowing_sanity(void);
static boolean get_gitinfo(char *, char *); static boolean get_gitinfo(char *, char *);
@@ -1817,7 +1817,7 @@ do_dungeon(void)
* for the monstr field; * for the monstr field;
* run 'makedefs -m' to create src/monstr.c; ignore the complaints * run 'makedefs -m' to create src/monstr.c; ignore the complaints
* about it being deprecated; * about it being deprecated;
* transfer relevant generated monstr values to src/monst.c; * transfer relevant generated monstr values to include/monsters.h;
* delete src/monstr.c. * delete src/monstr.c.
*/ */
static int mstrength(struct permonst *); static int mstrength(struct permonst *);
@@ -2034,13 +2034,21 @@ do_questtxt(void)
return; return;
} }
static char temp[32]; /* limit a name to 30 characters (26 if "xyz_" prefix precedes it) */
static char *
static char *limit(char* name, int pref) /* limit a name to 30 characters */ macronamelimit(char *name, int pref)
{ {
(void) strncpy(temp, name, pref ? 26 : 30); static char macronametemp[32];
temp[pref ? 26 : 30] = 0; unsigned len = pref ? 26 : 30;
return temp;
#if 0 /* avoid potential warning about strncpy() not guaranteeing '\0' */
(void) strncpy(macronametemp, name, len);
macronametemp[len] = '\0';
#else /* strncat() does guarantee terminating '\0' */
macronametemp[0] = '\0';
(void) strncat(macronametemp, name, len);
#endif
return macronametemp;
} }
void void
@@ -2152,7 +2160,7 @@ do_objs(void)
break; break;
} }
if (prefix >= 0) if (prefix >= 0)
Fprintf(ofp, "%s\t%d\n", limit(objnam, prefix), i); Fprintf(ofp, "%s\t%d\n", macronamelimit(objnam, prefix), i);
prefix = 0; prefix = 0;
sum += objects[i].oc_prob; sum += objects[i].oc_prob;
@@ -2190,7 +2198,7 @@ do_objs(void)
/* fudge _platinum_ YENDORIAN EXPRESS CARD */ /* fudge _platinum_ YENDORIAN EXPRESS CARD */
if (!strncmp(objnam, "PLATINUM_", 9)) if (!strncmp(objnam, "PLATINUM_", 9))
objnam += 9; objnam += 9;
Fprintf(ofp, "#define\tART_%s\t%d\n", limit(objnam, 1), i); Fprintf(ofp, "#define\tART_%s\t%d\n", macronamelimit(objnam, 1), i);
} }
Fprintf(ofp, "#define\tNROFARTIFACTS\t%d\n", i - 1); Fprintf(ofp, "#define\tNROFARTIFACTS\t%d\n", i - 1);