From b699392ee5e6c55d892a0ab1a639208a373d9bab Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Mon, 25 May 2009 23:14:33 +0000
Subject: sprintf -> snprintf

---
 phantasia/main.c | 15 ++++++++++-----
 phantasia/misc.c |  8 +++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'phantasia')

diff --git a/phantasia/main.c b/phantasia/main.c
index d9616859..8e206d58 100644
--- a/phantasia/main.c
+++ b/phantasia/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.18 2009/05/25 23:08:45 dholland Exp $	*/
+/*	$NetBSD: main.c,v 1.19 2009/05/25 23:14:33 dholland Exp $	*/
 
 /*
  * Phantasia 3.3.2 -- Interterminal fantasy game
@@ -647,7 +647,8 @@ titlelist(void)
 		    Other.p_status != S_NOTUSED)
 			/* found the king */
 		{
-			sprintf(Databuf, "The present ruler is %s  Level:%.0f",
+			snprintf(Databuf, SZ_DATABUF,
+			    "The present ruler is %s  Level:%.0f",
 			    Other.p_name, Other.p_level);
 			mvaddstr(4, 40 - strlen(Databuf) / 2, Databuf);
 			kingfound = TRUE;
@@ -662,7 +663,9 @@ titlelist(void)
 		if (Other.p_specialtype == SC_VALAR && Other.p_status != S_NOTUSED)
 			/* found the valar */
 		{
-			sprintf(Databuf, "The Valar is %s   Login:  %s", Other.p_name, Other.p_login);
+			snprintf(Databuf, SZ_DATABUF,
+				"The Valar is %s   Login:  %s",
+				Other.p_name, Other.p_login);
 			mvaddstr(6, 40 - strlen(Databuf) / 2, Databuf);
 			break;
 		}
@@ -678,7 +681,8 @@ titlelist(void)
 				councilfound = TRUE;
 			}
 			/* This assumes a finite (<=5) number of C.O.W.: */
-			sprintf(Databuf, "%s   Login:  %s", Other.p_name, Other.p_login);
+			snprintf(Databuf, SZ_DATABUF,
+				"%s   Login:  %s", Other.p_name, Other.p_login);
 			mvaddstr(Lines++, 40 - strlen(Databuf) / 2, Databuf);
 		}
 	/* search for the two highest players */
@@ -708,7 +712,8 @@ titlelist(void)
 				strcpy(nxtname, Other.p_name);
 			}
 	mvaddstr(15, 28, "Highest characters are:");
-	sprintf(Databuf, "%s  Level:%.0f   and   %s  Level:%.0f",
+	snprintf(Databuf, SZ_DATABUF,
+	    "%s  Level:%.0f   and   %s  Level:%.0f",
 	    hiname, hilvl, nxtname, nxtlvl);
 	mvaddstr(17, 40 - strlen(Databuf) / 2, Databuf);
 
diff --git a/phantasia/misc.c b/phantasia/misc.c
index c8f9c1e2..881f4cc4 100644
--- a/phantasia/misc.c
+++ b/phantasia/misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.16 2009/05/25 23:08:45 dholland Exp $	*/
+/*	$NetBSD: misc.c,v 1.17 2009/05/25 23:14:33 dholland Exp $	*/
 
 /*
  * misc.c  Phantasia miscellaneous support routines
@@ -133,9 +133,11 @@ descrlocation(struct player *playerp, phbool shortflag)
 							}
 
 	if (shortflag)
-		sprintf(Databuf, "%.29s", label);
+		snprintf(Databuf, SZ_DATABUF, "%.29s", label);
 	else
-		sprintf(Databuf, " is in %s  (%.0f,%.0f)", label, playerp->p_x, playerp->p_y);
+		snprintf(Databuf, SZ_DATABUF, 
+			" is in %s  (%.0f,%.0f)",
+			label, playerp->p_x, playerp->p_y);
 
 	return (Databuf);
 }
-- 
cgit v1.2.3-56-ge451