From 87e4e28dcfd5d74f82737daca741a3168dfc05d8 Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <thisisdaniellockyer@gmail.com>
Date: Fri, 24 Nov 2017 09:31:08 +0000
Subject: [PATCH 1/2] Replace empty ternary with helper method

---
 src/network/networkd-manager.c | 8 ++++----
 src/nspawn/nspawn-mount.c      | 4 ++--
 src/resolve/resolved-dns-rr.c  | 4 ++--
 src/shared/install-printf.c    | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 780f17392e..93a2571ec2 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -606,7 +606,7 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
         case RTM_NEWADDR:
                 if (address)
                         log_link_debug(link, "Updating address: %s/%u (valid %s%s)", buf, prefixlen,
-                                       valid_str ? "for " : "forever", valid_str ?: "");
+                                       valid_str ? "for " : "forever", strempty(valid_str));
                 else {
                         /* An address appeared that we did not request */
                         r = address_add_foreign(link, family, &in_addr, prefixlen, &address);
@@ -615,7 +615,7 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
                                 return 0;
                         } else
                                 log_link_debug(link, "Adding address: %s/%u (valid %s%s)", buf, prefixlen,
-                                               valid_str ? "for " : "forever", valid_str ?: "");
+                                               valid_str ? "for " : "forever", strempty(valid_str));
                 }
 
                 address_update(address, flags, scope, &cinfo);
@@ -626,11 +626,11 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
 
                 if (address) {
                         log_link_debug(link, "Removing address: %s/%u (valid %s%s)", buf, prefixlen,
-                                       valid_str ? "for " : "forever", valid_str ?: "");
+                                       valid_str ? "for " : "forever", strempty(valid_str));
                         address_drop(address);
                 } else
                         log_link_warning(link, "Removing non-existent address: %s/%u (valid %s%s)", buf, prefixlen,
-                                         valid_str ? "for " : "forever", valid_str ?: "");
+                                         valid_str ? "for " : "forever", strempty(valid_str));
 
                 break;
         default:
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
index 9e6f573ae3..e6a92411ad 100644
--- a/src/nspawn/nspawn-mount.c
+++ b/src/nspawn/nspawn-mount.c
@@ -368,7 +368,7 @@ static int tmpfs_patch_options(
                 assert(uid_shift != UID_INVALID);
 
                 if (asprintf(&buf, "%s%suid=" UID_FMT ",gid=" UID_FMT,
-                             options ?: "", options ? "," : "",
+                             strempty(options), options ? "," : "",
                              uid_shift, uid_shift) < 0)
                         return -ENOMEM;
 
@@ -379,7 +379,7 @@ static int tmpfs_patch_options(
         if (selinux_apifs_context) {
                 char *t;
 
-                t = strjoin(options ?: "", options ? "," : "",
+                t = strjoin(strempty(options), options ? "," : "",
                             "context=\"", selinux_apifs_context, "\"");
                 free(buf);
                 if (!t)
diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c
index 019935b58d..b44ab00bb5 100644
--- a/src/resolve/resolved-dns-rr.c
+++ b/src/resolve/resolved-dns-rr.c
@@ -335,8 +335,8 @@ char* dns_resource_key_to_string(const DnsResourceKey *key, char *buf, size_t bu
 
         snprintf(buf, buf_size, "%s %s%s%.0u %s%s%.0u",
                  dns_resource_key_name(key),
-                 c ?: "", c ? "" : "CLASS", c ? 0 : key->class,
-                 t ?: "", t ? "" : "TYPE", t ? 0 : key->class);
+                 strempty(c), c ? "" : "CLASS", c ? 0 : key->class,
+                 strempty(t), t ? "" : "TYPE", t ? 0 : key->class);
 
         return ans;
 }
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 596f7e46b6..f8d0e53eca 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -94,7 +94,7 @@ static int specifier_instance(char specifier, void *data, void *userdata, char *
                 return r;
 
         if (isempty(instance)) {
-                r = free_and_strdup(&instance, i->default_instance ?: "");
+                r = free_and_strdup(&instance, strempty(i->default_instance));
                 if (r < 0)
                         return r;
         }

From 95333b2bed6c3c642062c28bb55b19196c957bb9 Mon Sep 17 00:00:00 2001
From: Daniel Lockyer <thisisdaniellockyer@gmail.com>
Date: Fri, 24 Nov 2017 09:37:50 +0000
Subject: [PATCH 2/2] Replace free and nullify by mfree

---
 src/basic/cgroup-util.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index ae8f2d1160..7e4670ea8c 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2092,8 +2092,7 @@ int cg_get_keyed_attribute(const char *controller, const char *path, const char
         for (i = 0; keys[i]; i++) {
                 if (!values[i]) {
                         for (i = 0; keys[i]; i++) {
-                                free(values[i]);
-                                values[i] = NULL;
+                                values[i] = mfree(values[i]);
                         }
                         return -ENOENT;
                 }