summaryrefslogtreecommitdiff
path: root/cmd-line-utils
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-06-05 15:05:26 +0300
committerGeorgi Kodinov <joro@sun.com>2009-06-05 15:05:26 +0300
commit22454390c0ce1c3f90059811548a71ee18cac4f3 (patch)
treed9a8da33ea7968512cadbc8c78fba166c779e957 /cmd-line-utils
parent6199226f942a65a1ce80653146c4c3086695fec2 (diff)
downloadmariadb-git-22454390c0ce1c3f90059811548a71ee18cac4f3.tar.gz
Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSX
Fixed the 5.0-bugteam MacOSX warnings. client/mysqldump.c: Bug #45286: typecasts cmd-line-utils/readline/bind.c: Bug #45286: use variable of right type cmd-line-utils/readline/display.c: Bug #45286: use variable of right type dbug/user.r: Bug #45286: no warnings in generating man pages strings/ctype.c: Bug #45286: typecasts
Diffstat (limited to 'cmd-line-utils')
-rw-r--r--cmd-line-utils/readline/bind.c4
-rw-r--r--cmd-line-utils/readline/display.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c
index baed1dfad49..9d0a803cc6c 100644
--- a/cmd-line-utils/readline/bind.c
+++ b/cmd-line-utils/readline/bind.c
@@ -699,8 +699,10 @@ rl_function_of_keyseq (keyseq, map, type)
for (i = 0; keyseq && keyseq[i]; i++)
{
- unsigned char ic = keyseq[i];
+ unsigned char uc = keyseq[i];
+ int ic;
+ ic= uc;
if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
{
if (map[ESC].type == ISKMAP)
diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c
index 6f63faa9738..54c56954f43 100644
--- a/cmd-line-utils/readline/display.c
+++ b/cmd-line-utils/readline/display.c
@@ -1888,7 +1888,7 @@ rl_character_len (c, pos)
uc = (unsigned char)c;
- if (META_CHAR (uc))
+ if (META_CHAR (c))
return ((_rl_output_meta_chars == 0) ? 4 : 1);
if (uc == '\t')