From: keni <keni>
Date: Fri, 30 Dec 2011 23:58:48 +0000 (+0000)
Subject: again, looking for that failure condition: pager.c pickup.c
X-Git-Tag: MOVE2GIT~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86e9b65d206094e3eebcf502591650362ba6b1cf;p=nethack

again, looking for that failure condition: pager.c pickup.c
---

diff --git a/src/pager.c b/src/pager.c
index 446168f36..95a4e007c 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -881,7 +881,7 @@ dowhatdoes()
 #endif
 	reslt = dowhatdoes_core(q, bufr);
 	if (reslt)
-		pline("%s", reslt);
+		pline1(reslt);
 	else
 		pline("I've never heard of such commands.");
 	return 0;
diff --git a/src/pickup.c b/src/pickup.c
index bcf9f4c52..1545449ca 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -87,7 +87,7 @@ boolean here;		/* flag for type of obj list linkage */
 	if (!otmp) {
 	    impossible("simple_look(null)");
 	} else if (!(here ? otmp->nexthere : otmp->nobj)) {
-	    pline("%s", doname(otmp));
+	    pline1(doname(otmp));
 	} else {
 	    winid tmpwin = create_nhwindow(NHW_MENU);
 	    putstr(tmpwin, 0, "");
@@ -2321,7 +2321,7 @@ int held;
 	/* out-only or out before in */
 	if (loot_out && !loot_in_first) {
 	    if (!Has_contents(current_container)) {
-		pline("%s", emptymsg);		/* <whatever> is empty. */
+		pline1(emptymsg);		/* <whatever> is empty. */
 		if (!current_container->cknown) used = 1;
 		current_container->cknown = 1;
 	    } else {
@@ -2381,7 +2381,7 @@ int held;
 	/* out after in */
 	if (loot_out && loot_in_first) {
 	    if (!Has_contents(current_container)) {
-		pline("%s", emptymsg);		/* <whatever> is empty. */
+		pline1(emptymsg);		/* <whatever> is empty. */
 		if (!current_container->cknown) used = 1;
 		current_container->cknown = 1;
 	    } else {
@@ -2689,7 +2689,7 @@ dotip()
     else if (cobj->otyp == STATUE)
 	pline("Nothing interesting happens.");
     else
-	pline(nothing_happens);
+	pline1(nothing_happens);
     return 0;
 }