summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-07-18 19:03:08 -0400
committerGitHub <noreply@github.com>2016-07-18 19:03:08 -0400
commit53274d4cab90c7519fe53d6c222e892c036efc37 (patch)
tree3cbd0046b2b4d8a8393b796181b5ab9148d2bdbb
parent03e749af53bc6671270c300cdc5df4f2c5e0b9ae (diff)
parent12c40d4cc4332161baa928092c08455bfee36096 (diff)
Merge pull request #3749 from phomes/trivial-fixes3
Trivial fixes3
-rw-r--r--src/basic/process-util.c2
-rw-r--r--src/machine/machinectl.c1
-rw-r--r--src/network/networkd-conf.c2
-rw-r--r--src/nspawn/nspawn.c1
-rw-r--r--src/resolve/resolved-dns-packet.c2
-rw-r--r--src/systemctl/systemctl.c2
-rw-r--r--src/test/test-process-util.c2
7 files changed, 5 insertions, 7 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 3afb5e0a40..e38b67405e 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;
}
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 161dd3922b..96e0ab4b8a 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/network/networkd-conf.c b/src/network/networkd-conf.c
index b67a1f6d09..c03e2b2ebf 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) {
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index bedc5bf20b..e4be0a2251 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/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
index ea0be56d98..a8ad8fe342 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[] = {
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index b575437bcb..d3f437411a 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 99c92780b8..562ad4acb8 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;