diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 21:56:03 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 21:56:03 +0200 |
| commit | 601e6f4b2a78921304bc1d779991c615ee229f89 (patch) | |
| tree | 0a9f9390874c91b9e4430fecfbbffa72967e7b69 /cmd-line-utils/readline | |
| parent | 3d4095603952aca95892d55fb1ef435132de1197 (diff) | |
| download | mariadb-git-601e6f4b2a78921304bc1d779991c615ee229f89.tar.gz | |
Fixed compiler warnings
Don't assert if my_thread_end() is called twice (common case)
Diffstat (limited to 'cmd-line-utils/readline')
| -rw-r--r-- | cmd-line-utils/readline/bind.c | 4 | ||||
| -rw-r--r-- | cmd-line-utils/readline/histfile.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c index ab1136c7da5..568c3e8776a 100644 --- a/cmd-line-utils/readline/bind.c +++ b/cmd-line-utils/readline/bind.c @@ -337,6 +337,7 @@ rl_generic_bind (type, keyseq, data, map) KEYMAP_ENTRY k; k.function = 0; + k.type= 0; /* If no keys to bind to, exit right away. */ if (!keyseq || !*keyseq) @@ -735,7 +736,8 @@ _rl_read_file (filename, sizep) file_size = (size_t)finfo.st_size; /* check for overflow on very large files */ - if (file_size != finfo.st_size || file_size + 1 < file_size) + if ((long long) file_size != (long long) finfo.st_size || + file_size + 1 < file_size) { if (file >= 0) close (file); diff --git a/cmd-line-utils/readline/histfile.c b/cmd-line-utils/readline/histfile.c index 7d340b346d4..a7d6a68098e 100644 --- a/cmd-line-utils/readline/histfile.c +++ b/cmd-line-utils/readline/histfile.c @@ -184,7 +184,8 @@ read_history_range (filename, from, to) file_size = (size_t)finfo.st_size; /* check for overflow on very large files */ - if (file_size != finfo.st_size || file_size + 1 < file_size) + if ((long long) file_size != (long long) finfo.st_size || + file_size + 1 < file_size) { errno = overflow_errno; goto error_and_exit; |