hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make config_truth_value() const correct

Browse Source
This commit is contained in:
Johan Wikman
2016-12-08 13:56:25 +02:00
parent 585c4554c8
commit 777ea3ef43
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/config.h
View File

@ -238,7 +238,7 @@ bool config_set_qualified_param(CONFIG_PARAMETER* param,
void* val, void* val,
config_param_type_t type); config_param_type_t type);
int config_threadcount(); int config_threadcount();
int config_truth_value(char *); int config_truth_value(const char *);
void config_parameter_free(CONFIG_PARAMETER* p1); void config_parameter_free(CONFIG_PARAMETER* p1);
bool is_internal_service(const char *router); bool is_internal_service(const char *router);

7
server/core/config.c
View File

@ -91,7 +91,6 @@ static void feedback_defaults();
static bool check_config_objects(CONFIG_CONTEXT *context); static bool check_config_objects(CONFIG_CONTEXT *context);
static int maxscale_getline(char** dest, int* size, FILE* file); static int maxscale_getline(char** dest, int* size, FILE* file);
int config_truth_value(char *str);
int config_get_ifaddr(unsigned char *output); int config_get_ifaddr(unsigned char *output);
static int config_get_release_string(char* release); static int config_get_release_string(char* release);
FEEDBACK_CONF *config_get_feedback_data(); FEEDBACK_CONF *config_get_feedback_data();
@ -1362,7 +1361,7 @@ handle_global_item(const char *name, const char *value)
lognames[i].name, lognames[i].replacement); lognames[i].name, lognames[i].replacement);
} }
mxs_log_set_priority_enabled(lognames[i].priority, config_truth_value((char*)value)); mxs_log_set_priority_enabled(lognames[i].priority, config_truth_value(value));
} }
} }
} }
@ -1528,7 +1527,7 @@ handle_feedback_item(const char *name, const char *value)
int i; int i;
if (strcmp(name, "feedback_enable") == 0) if (strcmp(name, "feedback_enable") == 0)
{ {
feedback.feedback_enable = config_truth_value((char *)value); feedback.feedback_enable = config_truth_value(value);
} }
else if (strcmp(name, "feedback_user_info") == 0) else if (strcmp(name, "feedback_user_info") == 0)
{ {
@ -1996,7 +1995,7 @@ bool config_set_qualified_param(CONFIG_PARAMETER* param,
* @return Truth value * @return Truth value
*/ */
int int
config_truth_value(char *str) config_truth_value(const char *str)
{ {
if (strcasecmp(str, "true") == 0 || strcasecmp(str, "on") == 0 || if (strcasecmp(str, "true") == 0 || strcasecmp(str, "on") == 0 ||
strcasecmp(str, "yes") == 0 || strcasecmp(str, "1") == 0) strcasecmp(str, "yes") == 0 || strcasecmp(str, "1") == 0)