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

Clean config.h some more

Browse Source 
Moved some typedefs to router.h and server.h, changed a few
constants to these enums. Renamed some types in config.h to
remove "Gateway".

There are still some functions in the public header which are
only used in core, but they seem to fit the theme of public functions
so were not moved.
This commit is contained in:
Esa Korhonen
2017-01-24 16:34:48 +02:00
parent b923589222
commit 7d51864402
49 changed files with 178 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/service.c
View File

@ -101,7 +101,7 @@ static SERVICE *allServices = NULL;
static int find_type(typelib_t* tl, const char* needle, int maxlen);
static void service_add_qualified_param(SERVICE* svc,
CONFIG_PARAMETER* param);
MXS_CONFIG_PARAMETER* param);
static void service_internal_restart(void *data);
static void service_queue_check(void *data);
static void service_calculate_weights(SERVICE *service);
@ -1660,11 +1660,11 @@ int service_refresh_users(SERVICE *service)
return ret;
}
void service_add_parameters(SERVICE *service, const CONFIG_PARAMETER *param)
void service_add_parameters(SERVICE *service, const MXS_CONFIG_PARAMETER *param)
{
while (param)
{
CONFIG_PARAMETER *new_param = config_clone_param(param);
MXS_CONFIG_PARAMETER *new_param = config_clone_param(param);
new_param->next = service->svc_config_param;
service->svc_config_param = new_param;
param = param->next;
@ -1711,7 +1711,7 @@ static int find_type(typelib_t* tl,
* Add qualified config parameter to SERVICE struct.
*/
static void service_add_qualified_param(SERVICE* svc,
CONFIG_PARAMETER* param)
MXS_CONFIG_PARAMETER* param)
{
spinlock_acquire(&svc->spin);
@ -1722,12 +1722,12 @@ static void service_add_qualified_param(SERVICE* svc,
}
else
{
CONFIG_PARAMETER* p = svc->svc_config_param;
CONFIG_PARAMETER* prev = NULL;
MXS_CONFIG_PARAMETER* p = svc->svc_config_param;
MXS_CONFIG_PARAMETER* prev = NULL;
while (true)
{
CONFIG_PARAMETER* old;
MXS_CONFIG_PARAMETER* old;
/** Replace existing parameter in the list, free old */
if (strncasecmp(param->name,