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

some NONNULLs

Browse Source 
Update the prototypes of some functions which return a pointer that
will never be NULL.  Only covers pager.c and part of objnam.c.
This commit is contained in:
PatR
2023-12-20 15:55:21 -08:00
parent 07ef4583ce
commit a696cb8d90
2 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/objnam.c
View File

@@ -49,7 +49,7 @@ static boolean wishymatch(const char *, const char *, boolean);
static short rnd_otyp_by_wpnskill(schar);
static short rnd_otyp_by_namedesc(const char *, char, int);
static struct obj *wizterrainwish(struct _readobjnam_data *);
static void dbterrainmesg(const char *, coordxy, coordxy);
static void dbterrainmesg(const char *, coordxy, coordxy) NONNULLARG1;
static void readobjnam_init(char *, struct _readobjnam_data *);
static int readobjnam_preparse(struct _readobjnam_data *);
static void readobjnam_parse_charges(struct _readobjnam_data *);
@@ -2018,7 +2018,7 @@ aobjnam(struct obj *otmp, const char *verb)
/* combine yname and aobjnam eg "your count cxname(otmp)" */
char *
yobjnam(struct obj* obj, const char *verb)
yobjnam(struct obj *obj, const char *verb)
{
char *s = aobjnam(obj, verb);
@@ -2036,7 +2036,7 @@ yobjnam(struct obj* obj, const char *verb)
/* combine Yname2 and aobjnam eg "Your count cxname(otmp)" */
char *
Yobjnam2(struct obj* obj, const char *verb)
Yobjnam2(struct obj *obj, const char *verb)
{
register char *s = yobjnam(obj, verb);
@@ -2046,7 +2046,7 @@ Yobjnam2(struct obj* obj, const char *verb)
/* like aobjnam, but prepend "The", not count, and use xname */
char *
Tobjnam(struct obj* otmp, const char *verb)
Tobjnam(struct obj *otmp, const char *verb)
{
char *bp = The(xname(otmp));
@@ -2059,7 +2059,7 @@ Tobjnam(struct obj* otmp, const char *verb)
/* capitalized variant of doname() */
char *
Doname2(struct obj* obj)
Doname2(struct obj *obj)
{
char *s = doname(obj);
@@ -2070,7 +2070,7 @@ Doname2(struct obj* obj)
#if 0 /* stalled-out work in progress */
/* Doname2() for itemized buying of 'obj' from a shop */
char *
payDoname(struct obj* obj)
payDoname(struct obj *obj)
{
static const char and_contents[] = " and its contents";
char *p = doname(obj);
@@ -2092,7 +2092,7 @@ payDoname(struct obj* obj)
/* returns "[your ]xname(obj)" or "Foobar's xname(obj)" or "the xname(obj)" */
char *
yname(struct obj* obj)
yname(struct obj *obj)
{
char *s = cxname(obj);
@@ -2111,7 +2111,7 @@ yname(struct obj* obj)
/* capitalized variant of yname() */
char *
Yname2(struct obj* obj)
Yname2(struct obj *obj)
{
char *s = yname(obj);
@@ -2124,7 +2124,7 @@ Yname2(struct obj* obj)
* or "the minimal_xname(obj)"
*/
char *
ysimple_name(struct obj* obj)
ysimple_name(struct obj *obj)
{
char *outbuf = nextobuf();
char *s = shk_your(outbuf, obj); /* assert( s == outbuf ); */
@@ -2135,7 +2135,7 @@ ysimple_name(struct obj* obj)
/* capitalized variant of ysimple_name() */
char *
Ysimple_name2(struct obj* obj)
Ysimple_name2(struct obj *obj)
{
char *s = ysimple_name(obj);
@@ -2145,7 +2145,7 @@ Ysimple_name2(struct obj* obj)
/* "scroll" or "scrolls" */
char *
simpleonames(struct obj* obj)
simpleonames(struct obj *obj)
{
char *obufp, *simpleoname = minimal_xname(obj);
@@ -2163,7 +2163,7 @@ simpleonames(struct obj* obj)
/* "a scroll" or "scrolls"; "a silver bell" or "the Bell of Opening" */
char *
ansimpleoname(struct obj* obj)
ansimpleoname(struct obj *obj)
{
char *obufp, *simpleoname = simpleonames(obj);
int otyp = obj->otyp;