diff options
Diffstat (limited to 'editors/sed.c')
-rw-r--r-- | editors/sed.c | 18 |
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; default: 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"); } } out: @@ -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 {"); } } continue; |