trylink: automatically use custom link script if user provides one

vinfo_msg: one user (info_msg), incorporate in it
*: style fixes

3 files changed, 12 insertions, 28 deletions

diff --git a/libbb/Kbuild b/libbb/Kbuild
index c0cbe1aa9..3ffda1240 100644
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -88,7 +88,6 @@ lib-y += vdprintf.o
 lib-y += verror_msg.o
 lib-y += vfork_daemon_rexec.o
 lib-y += vherror_msg.o
-lib-y += vinfo_msg.o
 lib-y += vperror_msg.o
 lib-y += warn_ignoring_args.o
 lib-y += wfopen.o
diff --git a/libbb/info_msg.c b/libbb/info_msg.c
index c763ce60c..b0ce64338 100644
--- a/libbb/info_msg.c
+++ b/libbb/info_msg.c
@@ -7,13 +7,24 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
+#include <syslog.h>
 #include "libbb.h"
 
 void bb_info_msg(const char *s, ...)
 {
         va_list p;
+        /* va_copy is used because it is not portable
+         * to use va_list p twice */
+        va_list p2;
 
         va_start(p, s);
-        bb_vinfo_msg(s, p);
+        va_copy(p2, p);
+        if (logmode & LOGMODE_STDIO) {
+                vprintf(s, p);
+                fputs(msg_eol, stdout);
+        }
+        if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG))
+                vsyslog(LOG_INFO, s, p2);
+        va_end(p2);
         va_end(p);
 }
diff --git a/libbb/vinfo_msg.c b/libbb/vinfo_msg.c
deleted file mode 100644
index fa2798625..000000000
--- a/libbb/vinfo_msg.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#include "libbb.h"
-#include <syslog.h>
-
-void bb_vinfo_msg(const char *s, va_list p)
-{
-        /* va_copy is used because it is not portable
-         * to use va_list p twice */
-        va_list p2;
-        va_copy(p2, p);
-        if (logmode & LOGMODE_STDIO) {
-                vprintf(s, p);
-                fputs(msg_eol, stdout);
-        }
-        if (ENABLE_FEATURE_SYSLOG && (logmode & LOGMODE_SYSLOG))
-                vsyslog(LOG_INFO, s, p2);
-        va_end(p2);
-}