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

silence some util/makdefs.c src/mdlib warnings

Browse Source 
In file included from makedefs.c:213:0:
../src/mdlib.c: In function ‘runtime_info_init’:
../src/mdlib.c:808:12: warning: variable ‘timeresult’ set but not used [-Wunused-but-set-variable]
     time_t timeresult;
            ^~~~~~~~~~
makedefs.c: In function ‘do_date’:
makedefs.c:1140:16: warning: unused variable ‘ind’ [-Wunused-variable]
     const char ind[] = "    ";
                ^~~
makedefs.c:1139:9: warning: unused variable ‘steps’ [-Wunused-variable]
     int steps = 0;
         ^~~~~
makedefs.c: In function ‘do_monstr’:
makedefs.c:1934:12: warning: variable ‘j’ set but not used [-Wunused-but-set-variable]
     int i, j;
            ^
This commit is contained in:
nhmall
2020-10-10 08:55:43 -04:00
parent 3d6551a70e
commit 55d1d547a6
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/mdlib.c
View File

@@ -799,6 +799,8 @@ build_options()
void void
runtime_info_init() runtime_info_init()
{ {
#if !defined(MAKEDEFS_C) && defined(CROSSCOMPILE_TARGET) \
&& defined(__DATE__) && defined(__TIME__)
int i; int i;
char tmpbuf[BUFSZ], *strp; char tmpbuf[BUFSZ], *strp;
const char *mth[] = { const char *mth[] = {
@@ -806,12 +808,15 @@ runtime_info_init()
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
struct tm t = {0}; struct tm t = {0};
time_t timeresult; time_t timeresult;
#endif
if (!done_runtime_opt_init_once) { if (!done_runtime_opt_init_once) {
done_runtime_opt_init_once = 1; done_runtime_opt_init_once = 1;
build_savebones_compat_string(); build_savebones_compat_string();
/* construct the current version number */ /* construct the current version number */
make_version(); make_version();
#if !defined(MAKEDEFS_C) && defined(CROSSCOMPILE_TARGET)
#if defined(__DATE__) && defined(__TIME__)
/* /*
* In a cross-compiled environment, you can't execute * In a cross-compiled environment, you can't execute
* the target binaries during the build, so we can't * the target binaries during the build, so we can't
@@ -831,8 +836,6 @@ runtime_info_init()
* gcc, msvc, clang __TIME__ "23:59:01" * gcc, msvc, clang __TIME__ "23:59:01"
* *
*/ */
#if defined(__DATE__) && defined(__TIME__)
if (sizeof __DATE__ + sizeof __TIME__ + sizeof "123" < if (sizeof __DATE__ + sizeof __TIME__ + sizeof "123" <
sizeof rttimebuf) sizeof rttimebuf)
Sprintf(rttimebuf, "%s %s", __DATE__, __TIME__); Sprintf(rttimebuf, "%s %s", __DATE__, __TIME__);
@@ -859,35 +862,28 @@ runtime_info_init()
extract_field(tmpbuf, rttimebuf, 2, 18); /* sec */ extract_field(tmpbuf, rttimebuf, 2, 18); /* sec */
t.tm_sec = atoi(tmpbuf); t.tm_sec = atoi(tmpbuf);
timeresult = mktime(&t); timeresult = mktime(&t);
#if !defined(MAKEDEFS_C) && defined(CROSSCOMPILE_TARGET)
BUILD_TIME = (unsigned long) timeresult; BUILD_TIME = (unsigned long) timeresult;
BUILD_DATE = rttimebuf; BUILD_DATE = rttimebuf;
#endif }
#else /* __DATE__ && __TIME__ */
nhUse(strp);
#endif /* __DATE__ && __TIME__ */ #endif /* __DATE__ && __TIME__ */
VERSION_NUMBER = version.incarnation;
#if !defined(MAKEDEFS_C) && defined(CROSSCOMPILE_TARGET) VERSION_FEATURES = version.feature_set;
VERSION_NUMBER = version.incarnation;
VERSION_FEATURES = version.feature_set;
#ifdef MD_IGNORED_FEATURES #ifdef MD_IGNORED_FEATURES
IGNORED_FEATURES = MD_IGNORED_FEATURES; IGNORED_FEATURES = MD_IGNORED_FEATURES;
#endif #endif
VERSION_SANITY1 = version.entity_count; VERSION_SANITY1 = version.entity_count;
VERSION_SANITY2 = version.struct_sizes1; VERSION_SANITY2 = version.struct_sizes1;
VERSION_SANITY3 = version.struct_sizes2; VERSION_SANITY3 = version.struct_sizes2;
VERSION_STRING = strdup(version_string(tmpbuf, "."));
VERSION_STRING = strdup(version_string(tmpbuf, ".")); VERSION_ID = strdup(version_id_string(tmpbuf, BUILD_DATE));
VERSION_ID = strdup(version_id_string(tmpbuf, BUILD_DATE)); COPYRIGHT_BANNER_C = strdup(bannerc_string(tmpbuf, BUILD_DATE));
COPYRIGHT_BANNER_C = strdup(bannerc_string(tmpbuf, BUILD_DATE));
#ifdef NETHACK_HOST_GIT_SHA #ifdef NETHACK_HOST_GIT_SHA
NETHACK_GIT_SHA = strdup(NETHACK_HOST_GIT_SHA); NETHACK_GIT_SHA = strdup(NETHACK_HOST_GIT_SHA);
#endif #endif
#ifdef NETHACK_HOST_GIT_BRANCH #ifdef NETHACK_HOST_GIT_BRANCH
NETHACK_GIT_BRANCH = strdup(NETHACK_HOST_GIT_BRANCH); NETHACK_GIT_BRANCH = strdup(NETHACK_HOST_GIT_BRANCH);
#endif #endif
#endif /* !MAKEDEFS_C && CROSSCOMPILE_TARGET */ #endif /* !MAKEDEFS_C && CROSSCOMPILE_TARGET */
}
idxopttext = 0; idxopttext = 0;
build_options(); build_options();
} }

6
util/makedefs.c
View File

@@ -1136,8 +1136,6 @@ do_date()
char *c, cbuf[60], buf[BUFSZ]; char *c, cbuf[60], buf[BUFSZ];
const char *ul_sfx; const char *ul_sfx;
#if defined(CROSSCOMPILE) && !defined(CROSSCOMPILE_TARGET) #if defined(CROSSCOMPILE) && !defined(CROSSCOMPILE_TARGET)
int steps = 0;
const char ind[] = " ";
const char *xpref = "HOST_"; const char *xpref = "HOST_";
#else #else
const char *xpref = (const char *) 0; const char *xpref = (const char *) 0;
@@ -1931,7 +1929,7 @@ void
do_monstr() do_monstr()
{ {
struct permonst *ptr; struct permonst *ptr;
int i, j; int i;
/* Don't break anything for ports that haven't been updated. */ /* Don't break anything for ports that haven't been updated. */
printf("DEPRECATION WARNINGS:\n"); printf("DEPRECATION WARNINGS:\n");
@@ -1973,7 +1971,7 @@ do_monstr()
/* output derived monstr values as a comment */ /* output derived monstr values as a comment */
Fprintf(ofp, "\n\n/*\n * default mons[].difficulty values\n *\n"); Fprintf(ofp, "\n\n/*\n * default mons[].difficulty values\n *\n");
for (ptr = &mons[0], j = 0; ptr->mlet; ptr++) { for (ptr = &mons[0]; ptr->mlet; ptr++) {
i = mstrength(ptr); i = mstrength(ptr);
Fprintf(ofp, "%-24s %2u\n", ptr->mname, (unsigned int) (uchar) i); Fprintf(ofp, "%-24s %2u\n", ptr->mname, (unsigned int) (uchar) i);
} }