path: root/editors/sed.c
diff options
authorGravatar James Byrne <james.byrne@origamienergy.com>2019-07-02 11:35:03 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2019-07-02 11:35:03 +0200
commit6937487be73cd4563b876413277a295a5fe2f32c (patch)
treef16cc9999a7c827891e6ec8d99c699fc791008ee /editors/sed.c
parentcaecfdc20d450686cd1f7e9b5f650322f894b3c2 (diff)
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower overhead call to bb_perror_msg() when only a string was being printed with no parameters. This saves space for some CPU architectures because it avoids the overhead of a call to a variadic function. However there has never been a simple version of bb_error_msg(), and since 2007 many new calls to bb_perror_msg() have been added that only take a single parameter and so could have been using bb_simple_perror_message(). This changeset introduces 'simple' versions of bb_info_msg(), bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and bb_herror_msg_and_die(), and replaces all calls that only take a single parameter, or use something like ("%s", arg), with calls to the corresponding 'simple' version. Since it is likely that single parameter calls to the variadic functions may be accidentally reintroduced in the future a new debugging config option WARN_SIMPLE_MSG has been introduced. This uses some macro magic which will cause any such calls to generate a warning, but this is turned off by default to avoid use of the unpleasant macros in normal circumstances. This is a large changeset due to the number of calls that have been replaced. The only files that contain changes other than simple substitution of function calls are libbb.h, libbb/herror_msg.c, libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c, networking/udhcp/common.h and util-linux/mdev.c additonal macros have been added for logging so that single parameter and multiple parameter logging variants exist. The amount of space saved varies considerably by architecture, and was found to be as follows (for 'defconfig' using GCC 7.4): Arm: -92 bytes MIPS: -52 bytes PPC: -1836 bytes x86_64: -938 bytes Note that for the MIPS architecture only an exception had to be made disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h) because it made these files larger on MIPS. Signed-off-by: James Byrne <james.byrne@origamienergy.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'editors/sed.c')
1 files changed, 9 insertions, 9 deletions
diff --git a/editors/sed.c b/editors/sed.c
index 57d3dda16..d3444003e 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -315,7 +315,7 @@ static int parse_regex_delim(const char *cmdstr, char **match, char **replace)
/* verify that the 's' or 'y' is followed by something. That something
* (typically a 'slash') is now our regexp delimiter... */
if (*cmdstr == '\0')
- bb_error_msg_and_die("bad format in substitution expression");
+ bb_simple_error_msg_and_die("bad format in substitution expression");
delimiter = *cmdstr_ptr++;
/* save the match string */
@@ -360,7 +360,7 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
} else {
*regex = G.previous_regex_ptr;
if (!G.previous_regex_ptr)
- bb_error_msg_and_die("no previous regexp");
+ bb_simple_error_msg_and_die("no previous regexp");
/* Move position to next character after last delimiter */
pos += (next+1);
@@ -378,7 +378,7 @@ static int parse_file_cmd(/*sed_cmd_t *sed_cmd,*/ const char *filecmdstr, char *
start = skip_whitespace(filecmdstr);
eol = strchrnul(start, '\n');
if (eol == start)
- bb_error_msg_and_die("empty filename");
+ bb_simple_error_msg_and_die("empty filename");
if (*eol) {
/* If lines glued together, put backslash back. */
@@ -468,7 +468,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
goto out;
dbg("s bad flags:'%s'", substr + idx);
- bb_error_msg_and_die("bad option in substitution expression");
+ bb_simple_error_msg_and_die("bad option in substitution expression");
@@ -688,7 +688,7 @@ static void add_cmd(const char *cmdstr)
idx--; /* if 0, trigger error check below */
if (idx < 0)
- bb_error_msg_and_die("no address after comma");
+ bb_simple_error_msg_and_die("no address after comma");
sed_cmd->end_line_orig = sed_cmd->end_line;
@@ -706,7 +706,7 @@ static void add_cmd(const char *cmdstr)
/* last part (mandatory) will be a command */
if (!*cmdstr)
- bb_error_msg_and_die("missing command");
+ bb_simple_error_msg_and_die("missing command");
sed_cmd->cmd = *cmdstr++;
cmdstr = parse_cmd_args(sed_cmd, cmdstr);
@@ -791,7 +791,7 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
if (!current_regex) {
current_regex = G.previous_regex_ptr;
if (!current_regex)
- bb_error_msg_and_die("no previous regexp");
+ bb_simple_error_msg_and_die("no previous regexp");
G.previous_regex_ptr = current_regex;
@@ -962,7 +962,7 @@ static void puts_maybe_newline(char *s, FILE *file, char *last_puts_char, char l
if (ferror(file)) {
xfunc_error_retval = 4; /* It's what gnu sed exits with... */
- bb_error_msg_and_die(bb_msg_write_error);
+ bb_simple_error_msg_and_die(bb_msg_write_error);
*last_puts_char = lpc;
@@ -1192,7 +1192,7 @@ static void process_files(void)
sed_cmd = sed_cmd->next;
if (!sed_cmd)
- bb_error_msg_and_die("unterminated {");
+ bb_simple_error_msg_and_die("unterminated {");