From 7bb346f23c5f7a31f210fe95dcba093d0dc51571 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 6 Oct 2009 22:09:50 +0200
Subject: [PATCH] *: use {i,u}toa() where appropriate

function                                             old     new   delta
startservice                                         377     363     -14
setari_u                                              54      40     -14
ash_main                                            1375    1361     -14
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-42)             Total: -42 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 coreutils/cal.c      | 2 +-
 editors/awk.c        | 4 +---
 miscutils/fbsplash.c | 4 +---
 runit/runsv.c        | 6 ++----
 shell/ash.c          | 4 +---
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/coreutils/cal.c b/coreutils/cal.c
index 9b597772e..ef70b0e35 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -147,7 +147,7 @@ int cal_main(int argc, char **argv)
 		unsigned *dp;
 		char lineout[80];
 
-		sprintf(lineout, "%d", year);
+		sprintf(lineout, "%u", year);
 		center(lineout,
 			   (WEEK_LEN * 3 + HEAD_SEP * 2)
 			   + julian * (J_WEEK_LEN * 2 + HEAD_SEP
diff --git a/editors/awk.c b/editors/awk.c
index d15dbb3e5..17244f9e6 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -765,11 +765,9 @@ static var *setvar_u(var *v, const char *value)
 /* set array element to user string */
 static void setari_u(var *a, int idx, const char *s)
 {
-	char sidx[sizeof(int)*3 + 1];
 	var *v;
 
-	sprintf(sidx, "%d", idx);
-	v = findvar(iamarray(a), sidx);
+	v = findvar(iamarray(a), itoa(idx));
 	setvar_u(v, s);
 }
 
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index ec0f092dc..3d225e549 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -391,9 +391,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv)
 		num = atoi(num_buf);
 		if (isdigit(num_buf[0]) && (num <= 100)) {
 #if DEBUG
-			char strVal[10];
-			sprintf(strVal, "%d", num);
-			DEBUG_MESSAGE(strVal);
+			DEBUG_MESSAGE(itoa(num));
 #endif
 			fb_drawprogressbar(num);
 		}
diff --git a/runit/runsv.c b/runit/runsv.c
index 4dfdd3dc1..8b787543f 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -311,7 +311,6 @@ static void startservice(struct svdir *s)
 	int p;
 	const char *arg[4];
 	char exitcode[sizeof(int)*3 + 2];
-	char sigcode[sizeof(int)*3 + 2];
 
 	if (s->state == S_FINISH) {
 /* Two arguments are given to ./finish. The first one is ./run exit code,
@@ -324,13 +323,12 @@ static void startservice(struct svdir *s)
 		arg[0] = "./finish";
 		arg[1] = "-1";
 		if (WIFEXITED(s->wstat)) {
-			sprintf(exitcode, "%u", (int) WEXITSTATUS(s->wstat));
+			*utoa_to_buf(WEXITSTATUS(s->wstat), exitcode, sizeof(exitcode)) = '\0';
 			arg[1] = exitcode;
 		}
 		//arg[2] = "0";
 		//if (WIFSIGNALED(s->wstat)) {
-			sprintf(sigcode, "%u", (int) WTERMSIG(s->wstat));
-			arg[2] = sigcode;
+			arg[2] = utoa(WTERMSIG(s->wstat));
 		//}
 		arg[3] = NULL;
 	} else {
diff --git a/shell/ash.c b/shell/ash.c
index 44d3a99a7..2e7228d3c 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13083,7 +13083,6 @@ init(void)
 	/* from var.c: */
 	{
 		char **envp;
-		char ppid[sizeof(int)*3 + 2];
 		const char *p;
 		struct stat st1, st2;
 
@@ -13094,8 +13093,7 @@ init(void)
 			}
 		}
 
-		sprintf(ppid, "%u", (unsigned) getppid());
-		setvar("PPID", ppid, 0);
+		setvar("PPID", utoa(getppid()), 0);
 
 		p = lookupvar("PWD");
 		if (p)