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

more 3.6 to 3.7 merge fix

Browse Source 
3.7 adds const
const char *fqn_prefix_names[PREFIX_COUNT];
This commit is contained in:
nhmall
2019-11-11 09:33:06 -05:00
parent b21f6ef46d
commit 277e6c7126
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files.c
+15 -12
View File
@@ -4244,8 +4244,11 @@ reveal_paths(VOID_ARGS)
{ {
const char *fqn, *filep; const char *fqn, *filep;
char buf[BUFSZ]; char buf[BUFSZ];
#if defined(UNIX) || defined(PREFIXES_IN_USE) #if defined(UNIX)
const char *strp; char *strp;
#endif
#if defined(PREFIXES_IN_USE)
const char *cstrp;
#endif #endif
#ifdef UNIX #ifdef UNIX
char *envp, cwdbuf[PATH_MAX]; char *envp, cwdbuf[PATH_MAX];
@@ -4263,10 +4266,10 @@ reveal_paths(VOID_ARGS)
#ifdef SYSCF #ifdef SYSCF
#ifdef PREFIXES_IN_USE #ifdef PREFIXES_IN_USE
strp = fqn_prefix_names[SYSCONFPREFIX]; cstrp = fqn_prefix_names[SYSCONFPREFIX];
maxlen = BUFSZ - sizeof " (in )"; maxlen = BUFSZ - sizeof " (in )";
if (strp && strlen(strp) < (size_t) maxlen) if (cstrp && strlen(cstrp) < (size_t) maxlen)
Sprintf(buf, " (in %s)", strp); Sprintf(buf, " (in %s)", cstrp);
#else #else
buf[0] = '\0'; buf[0] = '\0';
#endif #endif
@@ -4292,13 +4295,13 @@ reveal_paths(VOID_ARGS)
#ifndef UNIX #ifndef UNIX
#ifdef PREFIXES_IN_USE #ifdef PREFIXES_IN_USE
#ifdef WIN32 #ifdef WIN32
strp = fqn_prefix_names[SYSCONFPREFIX]; cstrp = fqn_prefix_names[SYSCONFPREFIX];
#else #else
strp = fqn_prefix_names[HACKPREFIX]; cstrp = fqn_prefix_names[HACKPREFIX];
#endif /* WIN32 */ #endif /* WIN32 */
maxlen = BUFSZ - sizeof " (in )"; maxlen = BUFSZ - sizeof " (in )";
if (strp && strlen(strp) < (size_t) maxlen) if (cstrp && strlen(cstrp) < (size_t) maxlen)
Sprintf(buf, " (in %s)", strp); Sprintf(buf, " (in %s)", cstrp);
#endif /* PREFIXES_IN_USE */ #endif /* PREFIXES_IN_USE */
raw_printf("Your game's loadable symbols file%s:", buf); raw_printf("Your game's loadable symbols file%s:", buf);
#endif /* UNIX */ #endif /* UNIX */
@@ -4327,10 +4330,10 @@ reveal_paths(VOID_ARGS)
buf[0] = '\0'; buf[0] = '\0';
#ifdef PREFIXES_IN_USE #ifdef PREFIXES_IN_USE
strp = fqn_prefix_names[CONFIGPREFIX]; cstrp = fqn_prefix_names[CONFIGPREFIX];
maxlen = BUFSZ - sizeof " (in )"; maxlen = BUFSZ - sizeof " (in )";
if (strp && strlen(strp) < (size_t) maxlen) if (cstrp && strlen(cstrp) < (size_t) maxlen)
Sprintf(buf, " (in %s)", strp); Sprintf(buf, " (in %s)", cstrp);
#endif /* PREFIXES_IN_USE */ #endif /* PREFIXES_IN_USE */
raw_printf("Your personal configuration file%s:", buf); raw_printf("Your personal configuration file%s:", buf);