diff options
author | Ignacio Galarza <iggy@mysql.com> | 2009-02-13 11:41:47 -0500 |
---|---|---|
committer | Ignacio Galarza <iggy@mysql.com> | 2009-02-13 11:41:47 -0500 |
commit | 2d9421c3bb7376bcfa5484d94b45df65d67e4468 (patch) | |
tree | 85b39362efeae16536a90f3a3624acd6916d4305 /server-tools | |
parent | bf63b815faa9b6dd14253b28aabaf48ba178fe5a (diff) | |
parent | 2b85c64d65385297f4a90265ae47cb298891dd5f (diff) | |
download | mariadb-git-2d9421c3bb7376bcfa5484d94b45df65d67e4468.tar.gz |
Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages. This change focuses on the warnings
that are covered by the ignore file: support-files/compiler_warnings.supp.
- Strings are guaranteed to be max uint in length
Diffstat (limited to 'server-tools')
-rw-r--r-- | server-tools/instance-manager/buffer.cc | 2 | ||||
-rw-r--r-- | server-tools/instance-manager/instance.cc | 2 | ||||
-rw-r--r-- | server-tools/instance-manager/options.cc | 2 | ||||
-rw-r--r-- | server-tools/instance-manager/parse.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/server-tools/instance-manager/buffer.cc b/server-tools/instance-manager/buffer.cc index 1c50b11609e..f197f42d009 100644 --- a/server-tools/instance-manager/buffer.cc +++ b/server-tools/instance-manager/buffer.cc @@ -100,7 +100,7 @@ err: int Buffer::get_size() { - return buffer_size; + return (uint) buffer_size; } diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index 4a1b658737e..1ad728d40eb 100644 --- a/server-tools/instance-manager/instance.cc +++ b/server-tools/instance-manager/instance.cc @@ -163,7 +163,7 @@ static bool start_process(Instance_options *instance_options, int cmdlen= 0; for (int i= 0; instance_options->argv[i] != 0; i++) - cmdlen+= strlen(instance_options->argv[i]) + 3; + cmdlen+= (uint) strlen(instance_options->argv[i]) + 3; cmdlen++; /* make room for the null */ char *cmdline= new char[cmdlen]; diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index 7eba3187dd9..d8667e155b5 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -103,7 +103,7 @@ const char *Options::Debug::config_str= "d:t:i:O,im.trace"; #endif static const char * const ANGEL_PID_FILE_SUFFIX= ".angel.pid"; -static const int ANGEL_PID_FILE_SUFFIX_LEN= strlen(ANGEL_PID_FILE_SUFFIX); +static const int ANGEL_PID_FILE_SUFFIX_LEN= (uint) strlen(ANGEL_PID_FILE_SUFFIX); /* List of options, accepted by the instance manager. diff --git a/server-tools/instance-manager/parse.h b/server-tools/instance-manager/parse.h index 00f7aa237b8..9c50ace5948 100644 --- a/server-tools/instance-manager/parse.h +++ b/server-tools/instance-manager/parse.h @@ -206,7 +206,7 @@ inline void get_word(const char **text, size_t *word_len, break; } - *word_len= word_end - *text; + *word_len= (uint) (word_end - *text); } #endif /* INCLUDES_MYSQL_INSTANCE_MANAGER_PARSE_H */ |