BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libbb: pass "" rather than NULL as format string in _nomsg functions 

function                                             old     new   delta
bb_perror_nomsg_and_die                                9      10      +1
bb_perror_nomsg                                        9      10      +1
bb_verror_msg                                        480     469     -11
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 2/-11)              Total: -9 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
master
Denys Vlasenko 2023-06-12 10:19:29 +02:00
parent 2ca39ffd44
commit 4bd70463c7
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libbb/perror_nomsg.c
View File

@ -6,17 +6,9 @@
* *
* Licensed under GPLv2 or later, see file LICENSE in this source tree. * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/ */
#include "libbb.h"
/* gcc warns about a null format string, therefore we provide
* modified definition without "attribute (format)"
* instead of including libbb.h */
//#include "libbb.h"
#include "platform.h"
extern void bb_perror_msg(const char *s, ...) FAST_FUNC;
/* suppress gcc "no previous prototype" warning */
void FAST_FUNC bb_perror_nomsg(void);
void FAST_FUNC bb_perror_nomsg(void) void FAST_FUNC bb_perror_nomsg(void)
{ {
bb_perror_msg(0); bb_simple_perror_msg("");
} }

12
libbb/perror_nomsg_and_die.c
View File

@ -6,17 +6,9 @@
* *
* Licensed under GPLv2 or later, see file LICENSE in this source tree. * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/ */
#include "libbb.h"
/* gcc warns about a null format string, therefore we provide
* modified definition without "attribute (format)"
* instead of including libbb.h */
//#include "libbb.h"
#include "platform.h"
extern void bb_perror_msg_and_die(const char *s, ...) FAST_FUNC;
/* suppress gcc "no previous prototype" warning */
void FAST_FUNC bb_perror_nomsg_and_die(void);
void FAST_FUNC bb_perror_nomsg_and_die(void) void FAST_FUNC bb_perror_nomsg_and_die(void)
{ {
bb_perror_msg_and_die(0); bb_simple_perror_msg_and_die("");
} }

6
libbb/verror_msg.c
View File

@ -26,9 +26,6 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
if (!logmode) if (!logmode)
return; return;
if (!s) /* nomsg[_and_die] uses NULL fmt */
s = ""; /* some libc don't like printf(NULL) */
applet_len = strlen(applet_name) + 2; /* "applet: " */ applet_len = strlen(applet_name) + 2; /* "applet: " */
strerr_len = strerr ? strlen(strerr) : 0; strerr_len = strerr ? strlen(strerr) : 0;
msgeol_len = strlen(msg_eol); msgeol_len = strlen(msg_eol);
@ -116,9 +113,6 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
if (!logmode) if (!logmode)
return; return;
if (!s) /* nomsg[_and_die] uses NULL fmt */
s = ""; /* some libc don't like printf(NULL) */
/* Prevent "derefing type-punned ptr will break aliasing rules" */ /* Prevent "derefing type-punned ptr will break aliasing rules" */
used = vasprintf((char**)(void*)msgptr, s, p); used = vasprintf((char**)(void*)msgptr, s, p);
if (used < 0) if (used < 0)