diff options
author | Denis Vlasenko | 2008-05-13 02:27:31 +0000 |
---|---|---|
committer | Denis Vlasenko | 2008-05-13 02:27:31 +0000 |
commit | 77ad97f199f1bf05e9a7609bbdd239dab825b258 (patch) | |
tree | cf117ebf8d4a50bc7ba0e4da4d60a98a944756c8 /libbb | |
parent | c4f12f59cc907577d787f816b37122809f896bb2 (diff) | |
download | busybox-77ad97f199f1bf05e9a7609bbdd239dab825b258.zip 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 'libbb')
-rw-r--r-- | libbb/lineedit.c | 8 | ||||
-rw-r--r-- | libbb/md5.c | 2 | ||||
-rw-r--r-- | libbb/read.c | 4 | ||||
-rw-r--r-- | libbb/u_signal_names.c | 4 | ||||
-rw-r--r-- | libbb/xfuncs_printf.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index d1a7a4b..62dcc55 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -262,7 +262,7 @@ static void input_backward(unsigned num) return; cursor -= num; - if (cmdedit_x >= num) { + if ((unsigned)cmdedit_x >= num) { cmdedit_x -= num; if (num <= 4) { /* This is longer by 5 bytes on x86. @@ -321,7 +321,7 @@ static void input_delete(int save) { int j = cursor; - if (j == command_len) + if (j == (int)command_len) return; #if ENABLE_FEATURE_EDITING_VI @@ -830,7 +830,7 @@ static void input_tab(smallint *lastWasTab) if (!*lastWasTab) { char *tmp, *tmp1; - int len_found; + size_t len_found; /* char matchBuf[MAX_LINELEN]; */ #define matchBuf (S.input_tab__matchBuf) int find_type; @@ -1787,7 +1787,7 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t if (vi_cmdmode) /* Don't self-insert */ break; #endif - if (command_len >= (maxsize - 2)) /* Need to leave space for enter */ + if ((int)command_len >= (maxsize - 2)) /* Need to leave space for enter */ break; command_len++; diff --git a/libbb/md5.c b/libbb/md5.c index 56f9727..8d4b9fe 100644 --- a/libbb/md5.c +++ b/libbb/md5.c @@ -383,7 +383,7 @@ void md5_hash(const void *buffer, size_t len, md5_ctx_t *ctx) // Process all input. while (len) { - int i = 64 - ctx->buflen; + unsigned i = 64 - ctx->buflen; // Copy data into aligned buffer. diff --git a/libbb/read.c b/libbb/read.c index 288358d..fb903c1 100644 --- a/libbb/read.c +++ b/libbb/read.c @@ -111,7 +111,7 @@ void xread(int fd, void *buf, size_t count) { if (count) { ssize_t size = full_read(fd, buf, count); - if (size != count) + if ((size_t)size != count) bb_error_msg_and_die("short read"); } } @@ -160,7 +160,7 @@ char *xmalloc_reads(int fd, char *buf, size_t *maxsz_p) goto jump_in; while (sz < maxsz) { - if (p - buf == sz) { + if ((size_t)(p - buf) == sz) { jump_in: buf = xrealloc(buf, sz + 128); p = buf + sz; diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c index 97e9949..7a0f75d 100644 --- a/libbb/u_signal_names.c +++ b/libbb/u_signal_names.c @@ -130,7 +130,7 @@ int get_signum(const char *name) return i; if (strncasecmp(name, "SIG", 3) == 0) name += 3; - for (i = 0; i < ARRAY_SIZE(signals); i++) + for (i = 0; (size_t)i < ARRAY_SIZE(signals); i++) if (strcasecmp(name, signals[i]) == 0) return i; @@ -172,7 +172,7 @@ void print_signames(void) { int signo; - for (signo = 1; signo < ARRAY_SIZE(signals); signo++) { + for (signo = 1; (size_t)signo < ARRAY_SIZE(signals); signo++) { const char *name = signals[signo]; if (name[0]) puts(name); diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index d3fb39f..105939b 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c @@ -204,7 +204,7 @@ void xwrite(int fd, const void *buf, size_t count) { if (count) { ssize_t size = full_write(fd, buf, count); - if (size != count) + if ((size_t)size != count) bb_error_msg_and_die("short write"); } } |