From 39a841cecf616098c9c8cf63bbfea5ea2922097c Mon Sep 17 00:00:00 2001
From: "Vladimir N. Oleynik"
Date: Thu, 29 Sep 2005 16:18:57 +0000
Subject: change interface to bb_xasprintf() - more perfect for me. ln.c:
 error_msg(str)->error_msg(%s, str) - remove standart "feature" for hackers
 reduce 100 bytes don't care in sum

---
 miscutils/less.c       | 7 ++-----
 miscutils/mountpoint.c | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'miscutils')

diff --git a/miscutils/less.c b/miscutils/less.c
index 7b1b96c..189b886 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -208,7 +208,7 @@ static void add_linenumbers(void) {
 
 	for (i = 0; i <= num_flines; i++) {
 		safe_strncpy(current_line, flines[i], 256);
-		bb_xasprintf(&flines[i],"%5d %s", i + 1, current_line);
+		flines[i] = bb_xasprintf("%5d %s", i + 1, current_line);
 	}
 }
 
@@ -618,11 +618,8 @@ static void colon_process(void) {
 
 static char *insert_highlights (char *line, int start, int end) {
 
-	char *new_line;
-
-	bb_xasprintf(&new_line, "%.*s%s%.*s%s%s", start, line, HIGHLIGHT,
+	return bb_xasprintf("%.*s%s%.*s%s%s", start, line, HIGHLIGHT,
 			end - start, line + start, NORMAL, line + end);
-	return new_line;
 }
 
 static char *process_regex_on_line(char *line, regex_t *pattern) {
diff --git a/miscutils/mountpoint.c b/miscutils/mountpoint.c
index 46b2d4e..771df55 100644
--- a/miscutils/mountpoint.c
+++ b/miscutils/mountpoint.c
@@ -46,8 +46,8 @@ int mountpoint_main(int argc, char **argv)
 			if (S_ISDIR(st.st_mode)) {
 				dev_t st_dev = st.st_dev;
 				ino_t st_ino = st.st_ino;
-				char *p;
-				bb_xasprintf(&p, "%s/..", arg);
+				char *p = bb_xasprintf("%s/..", arg);
+				
 				if (stat(p, &st) == 0) {
 					short ret = (st_dev != st.st_dev) ||
 						(st_dev == st.st_dev && st_ino == st.st_ino);
-- 
cgit v1.1