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

Merge branch 'develop' into MXS-1075

Browse Source
This commit is contained in:
MassimilianoPinto 2017-03-27 09:53:49 +02:00
commit 69ae85c400
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/maxscale/cdefs.h
View File

@ -39,6 +39,14 @@
#undef OPENSSL_THREAD_DEFINES
#define OPENSSL_THREAD_DEFINES 1
/**
* Fix compile errors for PRId64
* in Centos 6
*/
#ifndef __STDC_FORMAT_MACROS
# define __STDC_FORMAT_MACROS
#endif
/**
* Define intended for use with strerror.
*

3
server/core/config.cc
View File

@ -623,7 +623,8 @@ config_load_and_process(const char* filename, bool (*process_config)(CONFIG_CONT
if (duplicate_context_init(&dcontext))
{
CONFIG_CONTEXT ccontext = {.object = (char*)""};
CONFIG_CONTEXT ccontext = {};
ccontext.object = (char*)"";
if (config_load_single_file(filename, &dcontext, &ccontext))
{

7
server/core/config_runtime.cc
View File

@ -348,7 +348,8 @@ static void add_monitor_defaults(MXS_MONITOR *monitor)
{
/** Inject the default module parameters in case we only deleted
* a parameter */
CONFIG_CONTEXT ctx = {.object = (char*)""};
CONFIG_CONTEXT ctx = {};
ctx.object = (char*)"";
const MXS_MODULE *mod = get_module(monitor->module_name, MODULE_MONITOR);
if (mod)
@ -427,7 +428,9 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, char *key, char *value)
if (value[0])
{
MXS_CONFIG_PARAMETER p = {.name = key, .value = value};
MXS_CONFIG_PARAMETER p = {};
p.name = key;
p.value = value;
monitorAddParameters(monitor, &p);
}

4
server/core/dcb.cc
View File

@ -2461,7 +2461,9 @@ bool count_by_usage_cb(DCB *dcb, void *data)
int
dcb_count_by_usage(DCB_USAGE usage)
{
struct dcb_usage_count val = {.count = 0, .type = usage};
struct dcb_usage_count val = {};
val.count = 0;
val.type = usage;
dcb_foreach(count_by_usage_cb, &val);

3
server/core/filter.cc
View File

@ -329,7 +329,8 @@ filter_add_option(MXS_FILTER_DEF *filter, const char *option)
void
filter_add_parameter(MXS_FILTER_DEF *filter, const char *name, const char *value)
{
CONFIG_CONTEXT ctx = {.object = (char*)""};
CONFIG_CONTEXT ctx = {};
ctx.object = (char*)"";
config_add_param(&ctx, name, value);
ctx.parameters->next = filter->parameters;