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

Use config_copy_string in luafilter

Browse Source 
The function is intended to be used with string parameters that are
optional and are copied when defined. This removes the need to copy the
string to a local variable to perform checks on the value.
This commit is contained in:
Markus Mäkelä 2017-01-10 20:50:12 +02:00
parent b39c47e4df
commit 0c6739ebd3
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/filter/luafilter/luafilter.c
View File

@ -201,7 +201,6 @@ static FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
{
LUA_INSTANCE *my_instance;
bool error = false;
if ((my_instance = (LUA_INSTANCE*) MXS_CALLOC(1, sizeof(LUA_INSTANCE))) == NULL)
{
@ -210,17 +209,8 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
spinlock_init(&my_instance->lock);
const char *global_script = config_get_string(params, "global_script");
const char *session_script = config_get_string(params, "session_script");
if ((*global_script && (my_instance->global_script = MXS_STRDUP(global_script)) == NULL) ||
(*session_script && (my_instance->session_script = MXS_STRDUP(session_script)) == NULL))
{
MXS_FREE(my_instance->global_script);
MXS_FREE(my_instance->session_script);
MXS_FREE(my_instance);
return NULL;
}
my_instance->global_script = config_copy_string(params, "global_script");
my_instance->session_script = config_copy_string(params, "session_script");
if (my_instance->global_script)
{