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 *'.

diff --git a/include/extern.h b/include/extern.h
index 59c3830d61198154a22a3061e6731c5ce0b2bdb3..abfe6be657c188fba1614f97f876cde8c5f70c14 100644 (file)
--- 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 73995609c1af18af1cce33e9b49a2f4b27fa6522..af65ffbefb79631df2922121d09733e2254baa26 100644 (file)
--- 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);