4bd70463c
Denys Vlasenko
2023-06-12
Subject
libbb: pass "" rather than NULL as format string in _nomsg functions
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/perror_nomsg.c+2 -10
| @@ -6,17 +6,9 @@ | |
| * | |
| * 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) | |
| { | |
| - | bb_perror_msg(0); |
| + | bb_simple_perror_msg(""); |
| } | |
libbb/perror_nomsg_and_die.c+2 -10
| @@ -6,17 +6,9 @@ | |
| * | |
| * 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) | |
| { | |
| - | bb_perror_msg_and_die(0); |
| + | bb_simple_perror_msg_and_die(""); |
| } | |
libbb/verror_msg.c+0 -6
| @@ -26,9 +26,6 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr) | |
| if (!logmode) | |
| return; | |
| - | if (!s) /* nomsg[_and_die] uses NULL fmt */ |
| - | s = ""; /* some libc don't like printf(NULL) */ |
| - | |
| applet_len = strlen(applet_name) + 2; /* "applet: " */ | |
| strerr_len = strerr ? strlen(strerr) : 0; | |
| 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) | |
| 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" */ | |
| used = vasprintf((char**)(void*)msgptr, s, p); | |
| if (used < 0) | |