diff options
| author | Denis Vlasenko | 2008-02-16 13:18:17 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-02-16 13:18:17 +0000 |
| commit | 284d0faed6a1ec2adcc4b7aea31ae3d05b3b70d9 (patch) | |
| tree | 3cfcea06c5a5c9e454edd39b58111ef38810882c /editors/sed.c | |
| parent | 069e347863fa46f684ab6bd7e48cefd8fa74b629 (diff) | |
| download | busybox-284d0faed6a1ec2adcc4b7aea31ae3d05b3b70d9.zip busybox-284d0faed6a1ec2adcc4b7aea31ae3d05b3b70d9.tar.gz | |
random s/short/int/
add_cmd 1189 1190 +1
xconnect_ftpdata 118 117 -1
data_align 86 84 -2
process_files 2101 2096 -5
forkexec 1345 1334 -11
Diffstat (limited to 'editors/sed.c')
| -rw-r--r-- | editors/sed.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/editors/sed.c b/editors/sed.c index 0f5cab2..4334182 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -76,7 +76,7 @@ typedef struct sed_cmd_s { FILE *sw_file; /* File (sw) command writes to, -1 for none. */ char *string; /* Data string for (saicytb) commands. */ - unsigned short which_match; /* (s) Which match to replace (0 for all) */ + unsigned which_match; /* (s) Which match to replace (0 for all) */ /* Bitfields (gcc won't group them if we don't) */ unsigned invert:1; /* the '!' after the address */ @@ -353,7 +353,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr) /* Match 0 treated as all, multiple matches we take the last one. */ const char *pos = substr + idx; /* FIXME: error check? */ - sed_cmd->which_match = (unsigned short)strtol(substr+idx, (char**) &pos, 10); + sed_cmd->which_match = (unsigned)strtol(substr+idx, (char**) &pos, 10); idx = pos - substr; } continue; @@ -364,7 +364,8 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr) switch (substr[idx]) { /* Replace all occurrences */ case 'g': - if (match[0] != '^') sed_cmd->which_match = 0; + if (match[0] != '^') + sed_cmd->which_match = 0; break; /* Print pattern space */ case 'p': @@ -683,7 +684,8 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line) altered++; /* if we're not doing this globally, get out now */ - if (sed_cmd->which_match) break; + if (sed_cmd->which_match) + break; } while (*oldline && (regexec(current_regex, oldline, 10, G.regmatch, 0) != REG_NOMATCH)); /* Copy rest of string into output pipeline */ |