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

some C99 changes

Browse Source 
Instead of using index() macro defined to strchr, use C99 strchr.
Instead of using rindex() macro defined to strrchr, use C99 strrchr.

If you want to try building on a platform that doesn't offer those
two functions, these are available:
    define NOT_C99       /* to make some non-C99 code available */
    define NEED_INDEX    /* to define a macro for index()  */
    define NEED_RINDX    /* to define a macro for rindex() */
This commit is contained in:
nhmall
2022-10-29 10:54:25 -04:00
parent 943c1bc3c3
commit 99a93fe50b
99 changed files with 463 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win/tty/getline.c
View File

@@ -224,7 +224,7 @@ xwaitforspace(register const char *s) /* chars allowed besides return */
morc = '\033';
break;
}
if ((s && index(s, c)) || c == x || (x == '\n' && c == '\r')) {
if ((s && strchr(s, c)) || c == x || (x == '\n' && c == '\r')) {
morc = (char) c;
break;
}

16
win/tty/topl.c
View File

@@ -288,7 +288,7 @@ update_topl(register const char *bp)
break;
if (tl == otl) {
/* Eek! A huge token. Try splitting after it. */
tl = index(otl, ' ');
tl = strchr(otl, ' ');
if (!tl)
break; /* No choice but to spit it out whole. */
}
@@ -396,7 +396,7 @@ tty_yn_function(
if (resp) {
char *rb, respbuf[QBUFSZ];
allow_num = (index(resp, '#') != 0);
allow_num = (strchr(resp, '#') != 0);
Strcpy(respbuf, resp);
/* normally we force lowercase, but if any uppercase letters
are present in the allowed response, preserve case;
@@ -407,7 +407,7 @@ tty_yn_function(
break;
}
/* any acceptable responses that follow <esc> aren't displayed */
if ((rb = index(respbuf, '\033')) != 0)
if ((rb = strchr(respbuf, '\033')) != 0)
*rb = '\0';
(void) strncpy(prompt, query, QBUFSZ - 1);
prompt[QBUFSZ - 1] = '\0';
@@ -461,18 +461,18 @@ tty_yn_function(
}
digit_ok = allow_num && digit(q);
if (q == '\033') {
if (index(resp, 'q'))
if (strchr(resp, 'q'))
q = 'q';
else if (index(resp, 'n'))
else if (strchr(resp, 'n'))
q = 'n';
else
q = def;
break;
} else if (index(quitchars, q)) {
} else if (strchr(quitchars, q)) {
q = def;
break;
}
if (!index(resp, q) && !digit_ok) {
if (!strchr(resp, q) && !digit_ok) {
tty_nhbell();
q = (char) 0;
} else if (q == '#' || digit_ok) {
@@ -498,7 +498,7 @@ tty_yn_function(
break; /* overflow: try again */
digit_string[0] = z;
addtopl(digit_string), n_len++;
} else if (z == 'y' || index(quitchars, z)) {
} else if (z == 'y' || strchr(quitchars, z)) {
if (z == '\033')
value = -1; /* abort */
z = '\n'; /* break */

32
win/tty/wintty.c
View File

@@ -637,9 +637,9 @@ tty_player_selection(void)
tty_putstr(BASE_WINDOW, 0, prompt);
do {
pick4u = lowc(readchar());
if (index(quitchars, pick4u))
if (strchr(quitchars, pick4u))
pick4u = 'y';
} while (!index(ynaqchars, pick4u));
} while (!strchr(ynaqchars, pick4u));
if ((int) strlen(prompt) + 1 < CO) {
/* Echo choice and move back down line */
tty_putsym(BASE_WINDOW, (int) strlen(prompt) + 1, echoline,
@@ -2039,11 +2039,11 @@ process_menu_window(winid window, struct WinDesc *cw)
accelerator; including it in gacc allows gold to
be selected via group when not on current page */
|| curr->gselector == GOLD_SYM)
&& !index(gacc, curr->gselector)
&& !strchr(gacc, curr->gselector)
&& (cw->how == PICK_ANY
|| gcnt[GSELIDX(curr->gselector)] == 1)) {
*rp++ = curr->gselector;
*rp = '\0'; /* re-terminate for index() */
*rp = '\0'; /* re-terminate for strchr() */
}
}
resp_len = 0; /* lint suppression */
@@ -2101,7 +2101,7 @@ process_menu_window(winid window, struct WinDesc *cw)
entries, so we don't rely on curr->identifier here) */
attr_n = 0; /* whole line */
if (curr->str[0] && curr->str[1] == ' '
&& curr->str[2] && index("-+#", curr->str[2])
&& curr->str[2] && strchr("-+#", curr->str[2])
&& curr->str[3] == ' ')
/* [0]=letter, [1]==space, [2]=[-+#], [3]=space */
attr_n = 4; /* [4:N]=entry description */
@@ -2198,7 +2198,7 @@ process_menu_window(winid window, struct WinDesc *cw)
}
really_morc = morc; /* (only used with MENU_EXPLICIT_CHOICE) */
if ((rp = index(resp, morc)) != 0 && rp < resp + resp_len)
if ((rp = strchr(resp, morc)) != 0 && rp < resp + resp_len)
/* explicit menu selection; don't override it if it also
happens to match a mapped menu command (such as ':' to
look inside a container vs ':' to search) */
@@ -2220,7 +2220,7 @@ process_menu_window(winid window, struct WinDesc *cw)
/* special case: '0' is also the default ball class;
some menus use digits as potential group accelerators
but their entries don't rely on counts */
if (!counting && index(gacc, morc))
if (!counting && strchr(gacc, morc))
goto group_accel;
count = (count * 10L) + (long) (morc - '0');
@@ -2373,11 +2373,11 @@ process_menu_window(winid window, struct WinDesc *cw)
morc = really_morc;
/*FALLTHRU*/
default:
if (cw->how == PICK_NONE || !index(resp, morc)) {
if (cw->how == PICK_NONE || !strchr(resp, morc)) {
/* unacceptable input received */
tty_nhbell();
break;
} else if (index(gacc, morc)) {
} else if (strchr(gacc, morc)) {
group_accel:
/* group accelerator; for the PICK_ONE case, we know that
it matches exactly one item in order to be in gacc[] */
@@ -2820,7 +2820,7 @@ compress_str(const char *str)
/* compress out consecutive spaces if line is too long;
topline wrapping converts space at wrap point into newline,
we reverse that here */
if ((int) strlen(str) >= CO || index(str, '\n')) {
if ((int) strlen(str) >= CO || strchr(str, '\n')) {
const char *in_str = str;
char c, *outstr = cbuf, *outend = &cbuf[sizeof cbuf - 1];
boolean was_space = TRUE; /* True discards all leading spaces;
@@ -2919,7 +2919,7 @@ tty_putstr(winid window, int attr, const char *str)
*ob = '\0';
if (!cw->cury && (int) strlen(str) >= CO) {
/* the characters before "St:" are unnecessary */
nb = index(str, ':');
nb = strchr(str, ':');
if (nb && nb > str + 2)
str = nb - 2;
}
@@ -3102,13 +3102,13 @@ tty_display_file(const char *fname, boolean complain)
wins[datawin]->offy = 0;
}
while (dlb_fgets(buf, BUFSZ, f)) {
if ((cr = index(buf, '\n')) != 0)
if ((cr = strchr(buf, '\n')) != 0)
*cr = 0;
#ifdef MSDOS
if ((cr = index(buf, '\r')) != 0)
if ((cr = strchr(buf, '\r')) != 0)
*cr = 0;
#endif
if (index(buf, '\t') != 0)
if (strchr(buf, '\t') != 0)
(void) tabexpand(buf);
empty = FALSE;
tty_putstr(datawin, 0, buf);
@@ -4838,7 +4838,7 @@ tty_status_update(int fldidx, genericptr_t ptr, int chg UNUSED, int percent,
break;
case BL_GOLD:
/* \GXXXXNNNN counts as 1 [moot since we use decode_mixed() above] */
if ((p = index(status_vals[fldidx], '\\')) != 0 && p[1] == 'G')
if ((p = strchr(status_vals[fldidx], '\\')) != 0 && p[1] == 'G')
tty_status[NOW][fldidx].lth -= (10 - 1);
break;
case BL_CAP:
@@ -5139,7 +5139,7 @@ shrink_dlvl(int lvl)
{
/* try changing Dlvl: to Dl: */
char buf[BUFSZ];
char *levval = index(status_vals[BL_LEVELDESC], ':');
char *levval = strchr(status_vals[BL_LEVELDESC], ':');
if (levval) {
dlvl_shrinklvl = lvl;