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 | |
| parent | c4f12f59cc907577d787f816b37122809f896bb2 (diff) | |
| download | busybox-77ad97f199f1bf05e9a7609bbdd239dab825b258.tar.gz | |
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')
| -rw-r--r-- | editors/awk.c | 6 | ||||
| -rw-r--r-- | editors/sed.c | 6 | ||||
| -rw-r--r-- | editors/vi.c | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/editors/awk.c b/editors/awk.c index f04ea5ced..fef3246b8 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -676,7 +676,7 @@ static char nextchar(char **s) return c; } -static int ALWAYS_INLINE isalnum_(int c) +static ALWAYS_INLINE int isalnum_(int c) { return (isalnum(c) || c == '_'); } @@ -1682,7 +1682,7 @@ static void hashwalk_init(var *v, xhash *array) { char **w; hash_item *hi; - int i; + unsigned i; if (v->type & VF_WALK) free(v->x.walker); @@ -1996,7 +1996,7 @@ static var *exec_builtin(node *op, var *res) } nargs = i; - if (nargs < (info >> 30)) + if ((uint32_t)nargs < (info >> 30)) syntax_error(EMSG_TOO_FEW_ARGS); switch (info & OPNMASK) { 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) { char *oldline = *line; int altered = 0; - int match_count = 0; + unsigned match_count = 0; regex_t *current_regex; /* Handle empty regex. */ @@ -665,7 +665,9 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line) /* If we aren't interested in this match, output old line to end of match and continue */ - if (sed_cmd->which_match && sed_cmd->which_match != match_count) { + if (sed_cmd->which_match + && (sed_cmd->which_match != match_count) + ) { for (i = 0; i < G.regmatch[0].rm_eo; i++) pipe_putc(*oldline++); continue; diff --git a/editors/vi.c b/editors/vi.c index 4e5a5ac4a..5013d0d51 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -2239,7 +2239,9 @@ static char readit(void) // read (maybe cursor) key from stdin pfd[0].events = POLLIN; // keep reading while there are input chars, and room in buffer // for a complete ESC sequence (assuming 8 chars is enough) - while (safe_poll(pfd, 1, 0) > 0 && n <= (sizeof(readbuffer) - 8)) { + while ((safe_poll(pfd, 1, 0) > 0) + && ((size_t)n <= (sizeof(readbuffer) - 8)) + ) { // read the rest of the ESC string int r = safe_read(0, readbuffer + n, sizeof(readbuffer) - n); if (r > 0) |