From 0f7508090d8f4cf19e0f42c73baa7170c6607ac3 Mon Sep 17 00:00:00 2001 From: "nethack.allison" Date: Sat, 10 May 2003 16:21:12 +0000 Subject: [PATCH] safe_qbuf arguments Pat's compiler triggered a warning because safe_qbuf is declared as `char *' but might return `last_resort' which is `const char *'. --- include/extern.h | 2 +- src/pickup.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/extern.h b/include/extern.h index 59c3830d6..abfe6be65 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1481,7 +1481,7 @@ E int NDECL(doloot); E int FDECL(use_container, (struct obj *,int)); E int FDECL(loot_mon, (struct monst *,int *,boolean *)); E int NDECL(dotip); -E char *FDECL(safe_qbuf, (char *,unsigned,char *,char *,const char *)); +E char *FDECL(safe_qbuf, (char *,unsigned,char *,char *,char *)); /* ### pline.c ### */ diff --git a/src/pickup.c b/src/pickup.c index 73995609c..af65ffbef 100644 --- a/src/pickup.c +++ b/src/pickup.c @@ -540,7 +540,7 @@ menu_pickup: char qbuf[BUFSZ]; Sprintf(qbuf, "Pick up %s?", safe_qbuf("", sizeof("Pick up ?"), doname(obj), - an(simple_typename(obj->otyp)), something)); + an(simple_typename(obj->otyp)), "something")); switch ((obj->quan < 2L) ? ynaq(qbuf) : ynNaq(qbuf)) { case 'q': goto end_query; /* out 2 levels */ case 'n': continue; @@ -1132,7 +1132,7 @@ boolean telekinesis; moderateloadmsg); Sprintf(eos(qbuf), " %s. Continue?", safe_qbuf(qbuf, sizeof(" . Continue?"), - doname(obj), an(simple_typename(obj->otyp)), something)); + doname(obj), an(simple_typename(obj->otyp)), "something")); obj->quan = savequan; switch (ynq(qbuf)) { case 'q': result = -1; break; @@ -1156,8 +1156,7 @@ boolean telekinesis; */ char * safe_qbuf(qbuf, padlength, planA, planB, last_resort) -char *qbuf, *planA, *planB; -const char *last_resort; +char *qbuf, *planA, *planB, *last_resort; unsigned padlength; { unsigned textleft = QBUFSZ - (strlen(qbuf) + padlength);