]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
confile_utils: cleanup set_config_string_item()
authorChristian Brauner <christian.brauner@ubuntu.com>
Wed, 9 Dec 2020 08:58:11 +0000 (09:58 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Thu, 10 Dec 2020 19:39:52 +0000 (20:39 +0100)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/confile_utils.c

index f0358eb0df5cca2ad5bfc2d1725cca1fb1686915..474ac58d1a99a7903353bc66ec0a1b02c4d1c8ab 100644 (file)
@@ -628,19 +628,15 @@ int set_config_string_item(char **conf_item, const char *value)
        char *new_value;
 
        if (lxc_config_value_empty(value)) {
-               free(*conf_item);
-               *conf_item = NULL;
+               free_disarm(*conf_item);
                return 0;
        }
 
        new_value = strdup(value);
-       if (!new_value) {
-               SYSERROR("Failed to duplicate string \"%s\"", value);
-               return -1;
-       }
+       if (!new_value)
+               return log_error_errno(-ENOMEM, ENOMEM, "Failed to duplicate string \"%s\"", value);
 
-       free(*conf_item);
-       *conf_item = new_value;
+       free_move_ptr(*conf_item, new_value);
        return 0;
 }