diff options
author | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 03:40:42 +0200 |
---|---|---|
committer | monty@mysql.com/narttu.mysql.fi <> | 2006-11-30 03:40:42 +0200 |
commit | 3a35c30027ed27bf6d2f457168fab2e4ef9e198e (patch) | |
tree | 7cc1a3e7f00427d01d2117c9b3c41231a827afd3 /strings | |
parent | 717284b85cfdaeacb0e28177e13cf6fd24f36a3b (diff) | |
download | mariadb-git-3a35c30027ed27bf6d2f457168fab2e4ef9e198e.tar.gz |
Fixed compiler warnings (Mostly VC++):
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs
Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
Diffstat (limited to 'strings')
-rw-r--r-- | strings/ctype-simple.c | 4 | ||||
-rw-r--r-- | strings/my_strchr.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 9d10ba82114..ccc54cbf65f 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -1516,7 +1516,7 @@ my_strntoull10rnd_8bit(CHARSET_INFO *cs __attribute__((unused)), else { *error= 0; - return (ulonglong) (longlong) (long) -ul; + return (ulonglong) (longlong) -(long) ul; } } else @@ -1667,7 +1667,7 @@ ret_sign: return (ulonglong) LONGLONG_MIN; } *error= 0; - return (ulonglong) -ull; + return (ulonglong) -(longlong) ull; } else { diff --git a/strings/my_strchr.c b/strings/my_strchr.c index 3a5fbea906d..9fff52a8962 100644 --- a/strings/my_strchr.c +++ b/strings/my_strchr.c @@ -28,7 +28,7 @@ byte *my_strchr(CHARSET_INFO *cs, const char *str, const char *end, - char c) + pchar c) { uint mbl; while (str < end) |