tree-wide: use free_and_strdup_warn()

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index b791156097d57b7b0b1000cffacb0bbeee16a8dd..410168d4d68a9dc9cd9c53dab84685e041c36d06 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -920,10 +920,7 @@ int config_parse_socket_bindtodevice(
                 return 0;
         }
 
-        if (free_and_strdup(&s->bind_to_device, rvalue) < 0)
-                return log_oom();
-
-        return 0;
+        return free_and_strdup_warn(&s->bind_to_device, rvalue);
 }
 
 int config_parse_exec_input(

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 0ae8ab35aaf46c75eecdddf1b902f1e077f80e20..74f739b5139e8116833f940cb4cd6f39d5df4a1f 100644 (file)
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -667,7 +667,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
 
                 r = sscanf(value, "%m[0-9a-fA-F-]=%ms", &uuid, &uuid_value);
                 if (r != 2)
-                        return free_and_strdup(&arg_default_options, value) < 0 ? log_oom() : 0;
+                        return free_and_strdup_warn(&arg_default_options, value);
 
                 if (warn_uuid_invalid(uuid, key))
                         return 0;
@@ -691,11 +691,8 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                         return 0;
 
                 n = strspn(value, ALPHANUMERICAL "-");
-                if (value[n] != '=') {
-                        if (free_and_strdup(&arg_default_keyfile, value) < 0)
-                                 return log_oom();
-                        return 0;
-                }
+                if (value[n] != '=')
+                        return free_and_strdup_warn(&arg_default_keyfile, value);
 
                 uuid = strndup(value, n);
                 if (!uuid)

diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index c6e4d79e3a39ac31e5de14326dface02b9bd62ed..d9fccea5c90dd731ef45423b56348c754c48200d 100644 (file)
--- a/src/debug-generator/debug-generator.c
+++ b/src/debug-generator/debug-generator.c
@@ -68,27 +68,21 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                 else if (r > 0)
                         t = skip_dev_prefix(DEBUGTTY);
 
-                if (free_and_strdup(&arg_debug_shell, t) < 0)
-                        return log_oom();
+                return free_and_strdup_warn(&arg_debug_shell, t);
 
         } else if (streq(key, "systemd.unit")) {
 
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                r = free_and_strdup(&arg_default_unit, value);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to set default unit %s: %m", value);
+                return free_and_strdup_warn(&arg_default_unit, value);
 
         } else if (!value) {
                 const char *target;
 
                 target = runlevel_to_target(key);
-                if (target) {
-                        r = free_and_strdup(&arg_default_unit, target);
-                        if (r < 0)
-                                return log_error_errno(r, "Failed to set default unit %s: %m", target);
-                }
+                if (target)
+                        return free_and_strdup_warn(&arg_default_unit, target);
         }
 
         return 0;

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index a9cc03cc3f2beec74a057067725b5fc9e0e2a523..522d0ff1f085945276b3a3135004022e71a6e72e 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -210,10 +210,7 @@ static int prompt_loop(const char *text, char **l, unsigned percentage, bool (*i
                         }
 
                         log_info("Selected '%s'.", l[u-1]);
-                        if (free_and_strdup(ret, l[u-1]) < 0)
-                                return log_oom();
-
-                        return 0;
+                        return free_and_strdup_warn(ret, l[u-1]);
                 }
 
                 if (!is_valid(p)) {

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index b8862f0793dbc32def79d682a46fc8dbf01e6e02..a526d6e8fa8f6ce58940ad0082e7ce07037d5449 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -827,16 +827,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                if (free_and_strdup(&arg_root_what, value) < 0)
-                        return log_oom();
+                return free_and_strdup_warn(&arg_root_what, value);
 
         } else if (streq(key, "rootfstype")) {
 
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                if (free_and_strdup(&arg_root_fstype, value) < 0)
-                        return log_oom();
+                return free_and_strdup_warn(&arg_root_fstype, value);
 
         } else if (streq(key, "rootflags")) {
 
@@ -851,24 +849,21 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                if (free_and_strdup(&arg_root_hash, value) < 0)
-                        return log_oom();
+                return free_and_strdup_warn(&arg_root_hash, value);
 
         } else if (streq(key, "mount.usr")) {
 
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                if (free_and_strdup(&arg_usr_what, value) < 0)
-                        return log_oom();
+                return free_and_strdup_warn(&arg_usr_what, value);
 
         } else if (streq(key, "mount.usrfstype")) {
 
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                if (free_and_strdup(&arg_usr_fstype, value) < 0)
-                        return log_oom();
+                return free_and_strdup_warn(&arg_usr_fstype, value);
 
         } else if (streq(key, "mount.usrflags")) {
 

diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 39e67b57f8945544cbe093a4596a09e23ebb56a7..8b6fc520c5ebf4c7fb76059a31e2f6cfa16d2904 100644 (file)
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -241,13 +241,15 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 't':
-                        if (free_and_strdup(&arg_mount_type, optarg) < 0)
-                                return log_oom();
+                        r = free_and_strdup_warn(&arg_mount_type, optarg);
+                        if (r < 0)
+                                return r;
                         break;
 
                 case 'o':
-                        if (free_and_strdup(&arg_mount_options, optarg) < 0)
-                                return log_oom();
+                        r = free_and_strdup_warn(&arg_mount_options, optarg);
+                        if (r < 0)
+                                return r;
                         break;
 
                 case ARG_OWNER: {
@@ -271,8 +273,9 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_DESCRIPTION:
-                        if (free_and_strdup(&arg_description, optarg) < 0)
-                                return log_oom();
+                        r = free_and_strdup_warn(&arg_description, optarg);
+                        if (r < 0)
+                                return r;
                         break;
 
                 case 'p':

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 0e00cde87a18a28be11914ff009c886d973f3333..d7e0662453e85d99ce57de74b19b936cdd114ca4 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -1178,8 +1178,9 @@ int manager_set_hostname(Manager *m, const char *hostname) {
 
         log_debug("Setting transient hostname: '%s'", strna(hostname));
 
-        if (free_and_strdup(&m->dynamic_hostname, hostname) < 0)
-                return log_oom();
+        r = free_and_strdup_warn(&m->dynamic_hostname, hostname);
+        if (r < 0)
+                return r;
 
         if (!m->bus || sd_bus_is_ready(m->bus) <= 0) {
                 log_debug("Not connected to system bus, setting hostname later.");
@@ -1227,8 +1228,9 @@ int manager_set_timezone(Manager *m, const char *tz) {
         assert(tz);
 
         log_debug("Setting system timezone: '%s'", tz);
-        if (free_and_strdup(&m->dynamic_timezone, tz) < 0)
-                return log_oom();
+        r = free_and_strdup_warn(&m->dynamic_timezone, tz);
+        if (r < 0)
+                return r;
 
         if (!m->bus || sd_bus_is_ready(m->bus) <= 0) {
                 log_debug("Not connected to system bus, setting timezone later.");

diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
index b43d61468ea0b16a85ebf6e69a9e72d33355a8ae..74a00c52754da587925e2463668468b7c0d35b9b 100644 (file)
--- a/src/nspawn/nspawn-settings.c
+++ b/src/nspawn/nspawn-settings.c
@@ -706,10 +706,7 @@ int config_parse_hostname(
                 return 0;
         }
 
-        if (free_and_strdup(s, empty_to_null(rvalue)) < 0)
-                return log_oom();
-
-        return 0;
+        return free_and_strdup_warn(s, empty_to_null(rvalue));
 }
 
 int config_parse_oom_score_adjust(

diff --git a/src/run-generator/run-generator.c b/src/run-generator/run-generator.c
index 11e7d9e83103ea22f4ed13a934fed8708e2ecb66..29b511f8e12d23b6c4fbfcdfab0af60c92c11b00 100644 (file)
--- a/src/run-generator/run-generator.c
+++ b/src/run-generator/run-generator.c
@@ -39,16 +39,14 @@ static int parse(const char *key, const char *value, void *data) {
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                if (free_and_strdup(&arg_success_action, value) < 0)
-                        return log_oom();
+                return free_and_strdup_warn(&arg_success_action, value);
 
         } else if (proc_cmdline_key_streq(key, "systemd.run_failure_action")) {
 
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                if (free_and_strdup(&arg_failure_action, value) < 0)
-                        return log_oom();
+                return free_and_strdup_warn(&arg_failure_action, value);
         }
 
         return 0;

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 615782862bccb0f5e725d16ae0f5a5a73e403336..c3d7e536ec088cbd955c310240080f7e1ecea3b6 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -731,10 +731,7 @@ int config_parse_string(
         assert(rvalue);
         assert(data);
 
-        if (free_and_strdup(s, empty_to_null(rvalue)) < 0)
-                return log_oom();
-
-        return 0;
+        return free_and_strdup_warn(s, empty_to_null(rvalue));
 }
 
 int config_parse_path(

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 0653ae7a9cd1bfbf46614d1a837b06ba8cb198bc..9209f8f4b4bf5f639f97aacd99c71c96cab9850e 100644 (file)
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -702,10 +702,7 @@ int config_parse_ifalias(
                 return 0;
         }
 
-        if (free_and_strdup(s, rvalue) < 0)
-                return log_oom();
-
-        return 0;
+        return free_and_strdup_warn(s, rvalue);
 }
 
 int config_parse_rx_tx_queues(

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 96a391c07c8dbd0192bf5ca342954796587a107b..fb4de17a5cbfbf47246f7a1c7b9b1e7645607390 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2055,8 +2055,9 @@ static int udev_rule_apply_token_to_event(
                                        token->value);
                         break;
                 }
-                if (free_and_strdup(&event->name, buf) < 0)
-                        return log_oom();
+                r = free_and_strdup_warn(&event->name, buf);
+                if (r < 0)
+                        return r;
 
                 log_rule_debug(dev, rules, "NAME '%s'", event->name);
                 break;