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
win/win32/mhmain.c
+1 -1
View File
@@ -405,7 +405,7 @@ MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
if (GetNHApp()->regNetHackMode && ((lParam & 1 << 29) != 0)) {
unsigned char c = (unsigned char) (wParam & 0xFF);
unsigned char scancode = (lParam >> 16) & 0xFF;
if (index(extendedlist, tolower(c)) != 0) {
if (strchr(extendedlist, tolower(c)) != 0) {
NHEVENT_KBD(M(tolower(c)));
} else if (scancode == (SCANLO + SIZE(scanmap)) - 1) {
NHEVENT_KBD(M('?'));
win/win32/mswproc.c
+16 -16
View File
@@ -362,9 +362,9 @@ prompt_for_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(ynqchars, pick4u));
} while (!strchr(ynqchars, pick4u));
if ((int) strlen(prompt) + 1 < CO) {
/* Echo choice and move back down line */
/* tty_putsym(BASE_WINDOW, (int)strlen(prompt)+1, echoline,
@@ -1555,10 +1555,10 @@ mswin_yn_function(const char *question, const char *choices, char def)
if (choices) {
char *cb, choicebuf[QBUFSZ];
allow_num = (index(choices, '#') != 0);
allow_num = (strchr(choices, '#') != 0);
Strcpy(choicebuf, choices);
if ((cb = index(choicebuf, '\033')) != 0) {
if ((cb = strchr(choicebuf, '\033')) != 0) {
/* anything beyond <esc> is hidden */
*cb = '\0';
}
@@ -1570,7 +1570,7 @@ mswin_yn_function(const char *question, const char *choices, char def)
Strcat(message, " ");
/* escape maps to 'q' or 'n' or default, in that order */
yn_esc_map =
(index(choices, 'q') ? 'q' : (index(choices, 'n') ? 'n' : def));
(strchr(choices, 'q') ? 'q' : (strchr(choices, 'n') ? 'n' : def));
} else {
Strcpy(message, question);
Strcat(message, " ");
@@ -1597,17 +1597,17 @@ mswin_yn_function(const char *question, const char *choices, char def)
digit_ok = allow_num && digit(ch);
if (ch == '\033') {
if (index(choices, 'q'))
if (strchr(choices, 'q'))
ch = 'q';
else if (index(choices, 'n'))
else if (strchr(choices, 'n'))
ch = 'n';
else
ch = def;
break;
} else if (index(quitchars, ch)) {
} else if (strchr(quitchars, ch)) {
ch = def;
break;
} else if (!index(choices, ch) && !digit_ok) {
} else if (!strchr(choices, ch) && !digit_ok) {
mswin_nhbell();
ch = (char) 0;
/* and try again... */
@@ -1634,7 +1634,7 @@ mswin_yn_function(const char *question, const char *choices, char def)
digit_string[0] = z;
mswin_putstr_ex(WIN_MESSAGE, ATR_BOLD, digit_string, 1);
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 */
@@ -2705,29 +2705,29 @@ mswin_color_from_string(char *colorstring, HBRUSH *brushptr,
if (strlen(++colorstring) != 6)
return;
red_value = (int) (index(hexadecimals, tolower((uchar) *colorstring))
red_value = (int) (strchr(hexadecimals, tolower((uchar) *colorstring))
- hexadecimals);
++colorstring;
red_value *= 16;
red_value += (int) (index(hexadecimals, tolower((uchar) *colorstring))
red_value += (int) (strchr(hexadecimals, tolower((uchar) *colorstring))
- hexadecimals);
++colorstring;
green_value = (int) (index(hexadecimals,
green_value = (int) (strchr(hexadecimals,
tolower((uchar) *colorstring))
- hexadecimals);
++colorstring;
green_value *= 16;
green_value += (int) (index(hexadecimals,
green_value += (int) (strchr(hexadecimals,
tolower((uchar) *colorstring))
- hexadecimals);
++colorstring;
blue_value = (int) (index(hexadecimals, tolower((uchar) *colorstring))
blue_value = (int) (strchr(hexadecimals, tolower((uchar) *colorstring))
- hexadecimals);
++colorstring;
blue_value *= 16;
blue_value += (int) (index(hexadecimals,
blue_value += (int) (strchr(hexadecimals,
tolower((uchar) *colorstring))
- hexadecimals);
++colorstring;