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

functions passed a chain explicitly NO_NONNULLS

Browse Source 
Some functions are passed an obj or monst chain,
and  the callers typically don't check them
against 0, so mark them explicitly as NO_NONNULLS

(NO_NONNULLS expands to nothing, but it flags that
some null arg analysis has been done)
This commit is contained in:
nhmall
2023-12-20 18:48:50 -05:00
parent d292ad7d17
commit 07ef4583ce
6 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/extern.h
View File

@@ -1104,7 +1104,8 @@ extern int calc_capacity(int);
extern int max_capacity(void);
extern boolean check_capacity(const char *);
extern int inv_cnt(boolean);
extern long money_cnt(struct obj *);
/* sometimes money_cnt(gi.invent) which can be null */
extern long money_cnt(struct obj *) NO_NONNULLS;
extern void spot_checks(coordxy, coordxy, schar);
/* ### hacklib.c ### */
@@ -1237,7 +1238,8 @@ extern struct obj *addinv_before(struct obj *, struct obj *) NONNULLARG1;
extern struct obj *addinv_nomerge(struct obj *) NONNULLARG1;
extern struct obj *hold_another_object(struct obj *, const char *,
const char *, const char *) NONNULLARG1;
extern void useupall(struct obj *) NONNULLARG1;
/* sometimes useupall(gi.invent) which can be null */
extern void useupall(struct obj *) NO_NONNULLS;
extern void useup(struct obj *) NONNULLARG1;
extern void consume_obj_charge(struct obj *, boolean) NONNULLARG1;
extern void freeinv_core(struct obj *) NONNULLARG1;
@@ -1266,7 +1268,7 @@ extern int askchain(struct obj **, const char *, int, int(*)(struct obj *),
extern void set_cknown_lknown(struct obj *) NONNULLARG1;
extern void fully_identify_obj(struct obj *) NONNULLARG1;
extern int identify(struct obj *) NONNULLARG1;
extern int count_unidentified(struct obj *);
extern int count_unidentified(struct obj *) NO_NONNULLS;
extern void identify_pack(int, boolean);
extern void learn_unseen_invent(void);
extern void update_inventory(void);
@@ -1301,7 +1303,8 @@ extern boolean check_invent_gold(const char *) NONNULLARG1;
extern int doorganize(void);
extern int adjust_split(void);
extern void free_pickinv_cache(void);
extern int count_unpaid(struct obj *);
/* sometimes count_unpaid(gi.invent) which can be null */
extern int count_unpaid(struct obj *) NO_NONNULLS;
extern int count_buc(struct obj *, int, boolean(*)(struct obj *));
extern void tally_BUCX(struct obj *, boolean, int *, int *, int *, int *,
int *, int *);
@@ -2294,9 +2297,13 @@ extern boolean allow_category(struct obj *) NONNULLARG1;
extern boolean is_worn_by_type(struct obj *) NONNULLARG1;
extern int ck_bag(struct obj *) NONNULLARG1;
extern void removed_from_icebox(struct obj *) NONNULLARG1;
extern void reset_justpicked(struct obj *) NONNULLARG1;
extern int count_justpicked(struct obj *) NONNULLARG1;
extern struct obj *find_justpicked(struct obj *) NONNULLARG1;
/* reset_justpicked() is sometimes passed gi.invent
* which can be null */
extern void reset_justpicked(struct obj *) NO_NONNULLS;
/* sometimes count_justpicked(gi.invent) which can be null */
extern int count_justpicked(struct obj *) NO_NONNULLS;
/* sometimes find_justpicked(gi.invent) which can be null */
extern struct obj *find_justpicked(struct obj *) NO_NONNULLS;
extern int pickup(int);
extern int pickup_object(struct obj *, long, boolean) NONNULLARG1;
extern int query_category(const char *, struct obj *, int, menu_item **, int) NONNULLARG14;
@@ -2909,7 +2916,7 @@ extern void maybe_absorb_item(struct monst *, struct obj *, int, int) NONNULLARG
extern void mdrop_obj(struct monst *, struct obj *, boolean) NONNULLARG12;
extern void mdrop_special_objs(struct monst *) NONNULLARG1;
extern void relobj(struct monst *, int, boolean) NONNULLARG1;
extern struct obj *findgold(struct obj *) NONNULLARG1;
extern struct obj *findgold(struct obj *) NO_NONNULLS;
/* ### steed.c ### */

2
src/end.c
View File

@@ -26,7 +26,7 @@ static void done_hangup(int);
#endif
#endif
static void disclose(int, boolean);
static void get_valuables(struct obj *);
static void get_valuables(struct obj *) NO_NONNULLS;
static void sort_valuables(struct valuable_data *, int);
static void artifact_score(struct obj *, boolean, winid);
static boolean fuzzer_savelife(int);

2
src/mon.c
View File

@@ -32,7 +32,7 @@ static boolean isspecmon(struct monst *);
static boolean validspecmon(struct monst *, int);
static int wiz_force_cham_form(struct monst *);
static struct permonst *accept_newcham_form(struct monst *, int);
static void kill_eggs(struct obj *);
static void kill_eggs(struct obj *) NO_NONNULLS;
static void pacify_guard(struct monst *);
extern const struct shclass shtypes[]; /* defined in shknam.c */

3
src/questpgr.c
View File

@@ -14,7 +14,8 @@
#endif
static const char *intermed(void);
static struct obj *find_qarti(struct obj *);
/* sometimes find_qarti(gi.invent), and gi.invent can be null */
static struct obj *find_qarti(struct obj *) NO_NONNULLS;
static const char *neminame(void);
static const char *guardname(void);
static const char *homebase(void);

6
src/save.c
View File

@@ -23,10 +23,10 @@ static void save_bubbles(NHFILE *, xint8);
static void save_stairs(NHFILE *);
static void save_bc(NHFILE *);
static void saveobj(NHFILE *, struct obj *);
static void saveobjchn(NHFILE *, struct obj **);
static void saveobjchn(NHFILE *, struct obj **) NO_NONNULLS;
static void savemon(NHFILE *, struct monst *);
static void savemonchn(NHFILE *, struct monst *);
static void savetrapchn(NHFILE *, struct trap *);
static void savemonchn(NHFILE *, struct monst *) NO_NONNULLS;
static void savetrapchn(NHFILE *, struct trap *) NO_NONNULLS;
static void save_gamelog(NHFILE *);
static void savegamestate(NHFILE *);
static void savelev_core(NHFILE *, xint8);

2
src/zap.c
View File

@@ -13,7 +13,7 @@
#define MAGIC_COOKIE 1000
static int zaptype(int);
static void probe_objchain(struct obj *);
static void probe_objchain(struct obj *) NO_NONNULLS;
static boolean zombie_can_dig(coordxy x, coordxy y);
static void polyuse(struct obj *, int, int);
static void create_polymon(struct obj *, int);