diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-13 02:27:31 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-05-13 02:27:31 +0000 |
commit | 77ad97f199f1bf05e9a7609bbdd239dab825b258 (patch) | |
tree | cf117ebf8d4a50bc7ba0e4da4d60a98a944756c8 /editors/sed.c | |
parent | c4f12f59cc907577d787f816b37122809f896bb2 (diff) | |
download | busybox-w32-77ad97f199f1bf05e9a7609bbdd239dab825b258.tar.gz busybox-w32-77ad97f199f1bf05e9a7609bbdd239dab825b258.tar.bz2 busybox-w32-77ad97f199f1bf05e9a7609bbdd239dab825b258.zip |
more -Wall warning fixes from Cristian Ionescu-Idbohrn.
This time it resulted in small code changes:
function old new delta
nexpr 820 828 +8
tail_main 1200 1202 +2
wrapf 166 167 +1
parse_mount_options 227 209 -18
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 11/-18) Total: -7 bytes
Diffstat (limited to 'editors/sed.c')
-rw-r--r-- | editors/sed.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/editors/sed.c b/editors/sed.c index f85884534..817840dc0 100644 --- a/editors/sed.c +++ b/editors/sed.c | |||
@@ -628,7 +628,7 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line) | |||
628 | { | 628 | { |
629 | char *oldline = *line; | 629 | char *oldline = *line; |
630 | int altered = 0; | 630 | int altered = 0; |
631 | int match_count = 0; | 631 | unsigned match_count = 0; |
632 | regex_t *current_regex; | 632 | regex_t *current_regex; |
633 | 633 | ||
634 | /* Handle empty regex. */ | 634 | /* Handle empty regex. */ |
@@ -665,7 +665,9 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line) | |||
665 | 665 | ||
666 | /* If we aren't interested in this match, output old line to | 666 | /* If we aren't interested in this match, output old line to |
667 | end of match and continue */ | 667 | end of match and continue */ |
668 | if (sed_cmd->which_match && sed_cmd->which_match != match_count) { | 668 | if (sed_cmd->which_match |
669 | && (sed_cmd->which_match != match_count) | ||
670 | ) { | ||
669 | for (i = 0; i < G.regmatch[0].rm_eo; i++) | 671 | for (i = 0; i < G.regmatch[0].rm_eo; i++) |
670 | pipe_putc(*oldline++); | 672 | pipe_putc(*oldline++); |
671 | continue; | 673 | continue; |