Factor out tap_is_explicit_no_script() helper, to simplify further changes.
Avoid extra copying by simpler code flow: first check for NULL / empty / "no" cases, then get default or do copying respectively. Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> Reviewed-by: Ben Chaney <[email protected]> Reviewed-by: Markus Armbruster <[email protected]> --- net/tap.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/net/tap.c b/net/tap.c index 57ffb09885c..2076f5b7802 100644 --- a/net/tap.c +++ b/net/tap.c @@ -92,19 +92,35 @@ static void launch_script(const char *setup_script, const char *ifname, static void tap_send(void *opaque); static void tap_writable(void *opaque); -static char *tap_parse_script(const char *script_arg, const char *default_path) +static bool tap_is_explicit_no_script(const char *script_arg_value) { - g_autofree char *res = g_strdup(script_arg); + if (!script_arg_value) { + return false; + } + + if (script_arg_value[0] == '\0') { + return true; + } - if (!res) { - res = get_relocated_path(default_path); + if (strcmp(script_arg_value, "no") == 0) { + return true; } - if (res[0] == '\0' || strcmp(res, "no") == 0) { + return false; +} + +static char *tap_parse_script(const char *script_arg_value, + const char *default_path) +{ + if (tap_is_explicit_no_script(script_arg_value)) { return NULL; } - return g_steal_pointer(&res); + if (!script_arg_value) { + return get_relocated_path(default_path); + } + + return g_strdup(script_arg_value); } static void tap_update_fd_handler(TAPState *s) -- 2.43.0
