From 0c6739ebd3b8fb8f1ad868175d7e8877cc91af66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 10 Jan 2017 20:50:12 +0200 Subject: [PATCH] Use config_copy_string in luafilter 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. --- server/modules/filter/luafilter/luafilter.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/server/modules/filter/luafilter/luafilter.c b/server/modules/filter/luafilter/luafilter.c index 40fd573f9..552dc145f 100644 --- a/server/modules/filter/luafilter/luafilter.c +++ b/server/modules/filter/luafilter/luafilter.c @@ -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) {