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
This commit is contained in:
Denis Vlasenko
2008-05-13 02:27:31 +00:00
parent c4f12f59cc
commit 77ad97f199
27 changed files with 69 additions and 61 deletions

View File

@@ -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) {

View File

@@ -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;

View File

@@ -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)