aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorGravatar "Vladimir N. Oleynik" <dzo@simtreas.ru>2005-09-29 16:18:57 +0000
committerGravatar "Vladimir N. Oleynik" <dzo@simtreas.ru>2005-09-29 16:18:57 +0000
commit39a841cecf616098c9c8cf63bbfea5ea2922097c (patch)
tree5b3a1d569d1e952d8c43899050dca4d6c47bf176 /miscutils
parent6a60c821a81b01a136037f8389bd42d86b37e395 (diff)
downloadbusybox-39a841cecf616098c9c8cf63bbfea5ea2922097c.tar.gz
busybox-39a841cecf616098c9c8cf63bbfea5ea2922097c.tar.bz2
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
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/less.c7
-rw-r--r--miscutils/mountpoint.c4
2 files changed, 4 insertions, 7 deletions
diff --git a/miscutils/less.c b/miscutils/less.c
index 7b1b96c6d..189b886f7 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 46b2d4e26..771df5588 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);