From 82edec5451c377197d514bd0549436a5471a695f Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Mon, 18 Jul 2016 22:09:57 +0200
Subject: [PATCH 1/4] network: fix indentation

---
 src/network/networkd-conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c
index b67a1f6d096..c03e2b2ebfe 100644
--- a/src/network/networkd-conf.c
+++ b/src/network/networkd-conf.c
@@ -70,7 +70,7 @@ int config_parse_duid_rawdata(
         for (;;) {
                 int n1, n2, len, r;
                 uint32_t byte;
-                 _cleanup_free_ char *cbyte = NULL;
+                _cleanup_free_ char *cbyte = NULL;
 
                 r = extract_first_word(&rvalue, &cbyte, ":", 0);
                 if (r < 0) {

From 65a6195e765c3b87f01e1b19211788e5ed3d22a7 Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Mon, 18 Jul 2016 22:14:23 +0200
Subject: [PATCH 2/4] basic: fix whitespace

---
 src/basic/process-util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 3afb5e0a409..e38b67405e4 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -196,7 +196,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
 
                                 *(k++) = (char) c;
                                 left--;
-                        }  else if (k > r)
+                        } else if (k > r)
                                 space = true;
                 }
 

From ba19c6e1819a89d3b90811ce4fd785a606dfd223 Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Mon, 18 Jul 2016 22:31:34 +0200
Subject: [PATCH 3/4] treewide: remove unused variables

---
 src/machine/machinectl.c     | 1 -
 src/nspawn/nspawn.c          | 1 -
 src/systemctl/systemctl.c    | 2 +-
 src/test/test-process-util.c | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 161dd3922b7..96e0ab4b8a9 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1551,7 +1551,6 @@ static int image_exists(sd_bus *bus, const char *name) {
 }
 
 static int make_service_name(const char *name, char **ret) {
-        _cleanup_free_ char *e = NULL;
         int r;
 
         assert(name);
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index bedc5bf20bc..e4be0a22513 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3125,7 +3125,6 @@ static int setup_uid_map(pid_t pid) {
 }
 
 static int nspawn_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
-        _cleanup_fdset_free_ FDSet *fds = NULL;
         char buf[NOTIFY_BUFFER_MAX+1];
         char *p = NULL;
         struct iovec iovec = {
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index b575437bcb5..d3f437411a9 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -5606,7 +5606,7 @@ static int mangle_names(char **original_names, char ***mangled_names) {
 }
 
 static int unit_exists(const char *unit) {
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL, *m = NULL;
+        _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_free_ char *path = NULL;
         static const struct bus_properties_map property_map[] = {
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index 99c92780b80..562ad4acb85 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -45,7 +45,7 @@
 
 static void test_get_process_comm(pid_t pid) {
         struct stat st;
-        _cleanup_free_ char *a = NULL, *c = NULL, *d = NULL, *f = NULL, *i = NULL, *cwd = NULL, *root = NULL;
+        _cleanup_free_ char *a = NULL, *c = NULL, *d = NULL, *f = NULL, *i = NULL;
         _cleanup_free_ char *env = NULL;
         char path[strlen("/proc//comm") + DECIMAL_STR_MAX(pid_t)];
         pid_t e;

From 12c40d4cc4332161baa928092c08455bfee36096 Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Mon, 18 Jul 2016 22:42:09 +0200
Subject: [PATCH 4/4] resolved: replace bitwise and with logical and

---
 src/resolve/resolved-dns-packet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index ea0be56d981..a8ad8fe342b 100644
--- a/src/resolve/resolved-dns-packet.c
+++ b/src/resolve/resolved-dns-packet.c
@@ -720,7 +720,7 @@ int dns_packet_append_opt(DnsPacket *p, uint16_t max_udp_size, bool edns0_do, in
                 goto fail;
 
         /* RDLENGTH */
-        if (edns0_do & !DNS_PACKET_QR(p)) {
+        if (edns0_do && !DNS_PACKET_QR(p)) {
                 /* If DO is on and this is not a reply, also append RFC6975 Algorithm data */
 
                 static const uint8_t rfc6975[] = {