database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

fix warnings

Browse Source 
server-tools/instance-manager/buffer.cc:
  perform initialization of static consts in .cc file to respect VC6
server-tools/instance-manager/buffer.h:
  fix compiler warning
server-tools/instance-manager/commands.cc:
  fix compiler warning
server-tools/instance-manager/user_map.cc:
  fix compiler warning
This commit is contained in:
unknown
2005-09-20 03:14:07 +04:00
parent 730fc4156d
commit c8c29f2dc4
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/buffer.cc
View File

@@ -21,6 +21,8 @@
#include "buffer.h" #include "buffer.h"
#include <m_string.h> #include <m_string.h>
const uint Buffer::BUFFER_INITIAL_SIZE= 4096;
const uint Buffer::MAX_BUFFER_SIZE= 16777216;
/* /*
Puts the given string to the buffer. Puts the given string to the buffer.

4
server-tools/instance-manager/buffer.h
View File

@@ -33,9 +33,9 @@
class Buffer class Buffer
{ {
private: private:
enum { BUFFER_INITIAL_SIZE= 4096 }; static const uint BUFFER_INITIAL_SIZE;
/* maximum buffer size is 16Mb */ /* maximum buffer size is 16Mb */
enum { MAX_BUFFER_SIZE= 16777216 }; static const uint MAX_BUFFER_SIZE;
size_t buffer_size; size_t buffer_size;
/* Error flag. Triggered if we get an error of some kind */ /* Error flag. Triggered if we get an error of some kind */
int error; int error;

4
server-tools/instance-manager/commands.cc
View File

@@ -695,9 +695,9 @@ Set_option::Set_option(Instance_map *instance_map_arg,
int Set_option::correct_file(int skip) int Set_option::correct_file(int skip)
{ {
int error; static const int mysys_to_im_error[]= { 0, ER_OUT_OF_RESOURCES,
const static int mysys_to_im_error[]= { 0, ER_OUT_OF_RESOURCES,
ER_ACCESS_OPTION_FILE }; ER_ACCESS_OPTION_FILE };
int error;
error= modify_defaults_file(Options::config_file, option, error= modify_defaults_file(Options::config_file, option,
option_value, instance_name, skip); option_value, instance_name, skip);

3
server-tools/instance-manager/user_map.cc
View File

@@ -66,7 +66,8 @@ int User::init(const char *line)
*/ */
if (password[strlen(password)-2] == '\r') if (password[strlen(password)-2] == '\r')
line_ending_len= 2; line_ending_len= 2;
if (strlen(password) != SCRAMBLED_PASSWORD_CHAR_LENGTH + line_ending_len) if (strlen(password) != (uint) (SCRAMBLED_PASSWORD_CHAR_LENGTH +
line_ending_len))
goto err; goto err;
memcpy(user, name_begin, user_length); memcpy(user, name_begin, user_length);