summaryrefslogtreecommitdiff
path: root/cmd-line-utils
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-09-23 15:21:29 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-09-23 15:21:29 +0200
commit6a89842e3642729fbac20a92a1655452f4d45487 (patch)
treebe24d592bff31a5a07c28cb307d81ed4f01b925a /cmd-line-utils
parentd49913877064778d8301c7bbd610238b3f5422cd (diff)
downloadmariadb-git-6a89842e3642729fbac20a92a1655452f4d45487.tar.gz
Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2 Cleaning up warnings not present in 5.0.
Diffstat (limited to 'cmd-line-utils')
-rw-r--r--cmd-line-utils/readline/display.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c
index f9b88f0006c..4a9dd466b2f 100644
--- a/cmd-line-utils/readline/display.c
+++ b/cmd-line-utils/readline/display.c
@@ -465,10 +465,10 @@ rl_redisplay ()
int newlines, lpos, temp, modmark;
const char *prompt_this_line;
#if defined (HANDLE_MULTIBYTE)
- int num, n0;
+ int num, n0= 0;
wchar_t wc;
size_t wc_bytes;
- int wc_width;
+ int wc_width= 0;
mbstate_t ps;
int _rl_wrapped_multicolumn = 0;
#endif
@@ -828,7 +828,7 @@ rl_redisplay ()
cpos_buffer_position = out;
lb_linenum = newlines;
}
- for (i = in; i < in+wc_bytes; i++)
+ for (i = in; i < in+(int)wc_bytes; i++)
line[out++] = rl_line_buffer[i];
for (i = 0; i < wc_width; i++)
CHECK_LPOS();