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

analyzer lint for i*.c

Browse Source
This commit is contained in:
PatR
2025-01-19 22:53:03 -08:00
parent 3a64b404e3
commit 6368bf2e73
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/insight.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 insight.c $NHDT-Date: 1724094296 2024/08/19 19:04:56 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.115 $ */ /* NetHack 3.7 insight.c $NHDT-Date: 1737384766 2025/01/20 06:52:46 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.128 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1073,7 +1073,8 @@ status_enlightenment(int mode, int final)
|| strcmp(MGIVENNAME(u.ustuck), "it") != 0)) || strcmp(MGIVENNAME(u.ustuck), "it") != 0))
Strcpy(heldmon, "an unseen creature"); Strcpy(heldmon, "an unseen creature");
} }
if (u.uswallow) { /* implies u.ustuck is non-Null */ if (u.uswallow) {
assert(u.ustuck != NULL); /* implied by u.uswallow */
Snprintf(buf, sizeof buf, "%s by %s", Snprintf(buf, sizeof buf, "%s by %s",
digests(u.ustuck->data) ? "swallowed" : "engulfed", digests(u.ustuck->data) ? "swallowed" : "engulfed",
heldmon); heldmon);

13
src/invent.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 invent.c $NHDT-Date: 1724094299 2024/08/19 19:04:59 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.516 $ */ /* NetHack 3.7 invent.c $NHDT-Date: 1737384766 2025/01/20 06:52:46 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.531 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2804,7 +2804,7 @@ xprname(
char suffix[80]; /* plenty of room for count and hallucinatory currency */ char suffix[80]; /* plenty of room for count and hallucinatory currency */
int sfxlen, txtlen; /* signed int for %*s formatting */ int sfxlen, txtlen; /* signed int for %*s formatting */
const char *fmt; const char *fmt;
boolean use_invlet = (flags.invlet_constant boolean use_invlet = (flags.invlet_constant && obj != NULL
&& let != CONTAINED_SYM && let != HANDS_SYM); && let != CONTAINED_SYM && let != HANDS_SYM);
long savequan = 0L; long savequan = 0L;
@@ -2819,8 +2819,10 @@ xprname(
* > Then the object is contained and doesn't have an inventory letter. * > Then the object is contained and doesn't have an inventory letter.
*/ */
fmt = "%c - %.*s%s"; fmt = "%c - %.*s%s";
if (!txt) if (!txt) {
assert(obj != NULL);
txt = doname(obj); txt = doname(obj);
}
txtlen = (int) strlen(txt); txtlen = (int) strlen(txt);
if (cost != 0L || let == '*') { if (cost != 0L || let == '*') {
@@ -3632,11 +3634,10 @@ display_pickinv(
Loot *sortedinvent, *srtinv; Loot *sortedinvent, *srtinv;
int8_t prevorderclass; int8_t prevorderclass;
boolean (*filter)(struct obj *) = (boolean (*)(OBJ_P)) 0; boolean (*filter)(struct obj *) = (boolean (*)(OBJ_P)) 0;
boolean wizid = (wizard && iflags.override_ID), gotsomething = FALSE; boolean wizid = (wizard && iflags.override_ID), gotsomething = FALSE;
int clr = NO_COLOR, menu_behavior = MENU_BEHAVE_STANDARD; int clr = NO_COLOR, menu_behavior = MENU_BEHAVE_STANDARD;
boolean show_gold = TRUE, inuse_only = FALSE, skipped_gold = FALSE, boolean show_gold = TRUE, inuse_only = FALSE, skipped_gold = FALSE,
doing_perm_invent = FALSE, save_flags_sortpack = flags.sortpack, doing_perm_invent = FALSE, save_flags_sortpack,
usextra = (xtra_choice && allowxtra); usextra = (xtra_choice && allowxtra);
if (lets && !*lets) if (lets && !*lets)
@@ -4231,7 +4232,7 @@ dounpaid(
} }
win = create_nhwindow(NHW_MENU); win = create_nhwindow(NHW_MENU);
cost = totcost = 0; totcost = 0L;
num_so_far = 0; /* count of # printed so far */ num_so_far = 0; /* count of # printed so far */
if (!flags.invlet_constant) if (!flags.invlet_constant)
reassign(); reassign();