summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-22 19:26:27 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-24 19:24:14 -0500
commitbdd13f6be4b588568683a1ab54f421fc6a636dbb (patch)
tree1a1f661d8e83011f53e9122f7dc61272dc16ddfa /src/journal
parente9a2e453bbe3522db4341e4a2a49ae8aab8eb5a3 (diff)
Remove dead lines in various places
As pointed-out by clang -Wunreachable-code. No behaviour changes.
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journal-file.c2
-rw-r--r--src/journal/journald-server.c18
-rw-r--r--src/journal/sd-journal.c2
3 files changed, 7 insertions, 15 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 23c4d28e73..5876733598 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2210,8 +2210,6 @@ int journal_file_move_to_entry_by_monotonic_for_data(
z = q;
}
-
- return 0;
}
int journal_file_move_to_entry_by_seqnum_for_data(
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 96ef66db5f..2a90b443b1 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1131,15 +1131,13 @@ int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userda
union {
struct cmsghdr cmsghdr;
- /* We use NAME_MAX space for the
- * SELinux label here. The kernel
- * currently enforces no limit, but
- * according to suggestions from the
- * SELinux people this will change and
- * it will probably be identical to
- * NAME_MAX. For now we use that, but
- * this should be updated one day when
- * the final limit is known.*/
+ /* We use NAME_MAX space for the SELinux label
+ * here. The kernel currently enforces no
+ * limit, but according to suggestions from
+ * the SELinux people this will change and it
+ * will probably be identical to NAME_MAX. For
+ * now we use that, but this should be updated
+ * one day when the final limit is known.*/
uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
CMSG_SPACE(sizeof(struct timeval)) +
CMSG_SPACE(sizeof(int)) + /* fd */
@@ -1216,8 +1214,6 @@ int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userda
close_many(fds, n_fds);
}
-
- return 0;
}
static int dispatch_sigusr1(sd_event_source *es, const struct signalfd_siginfo *si, void *userdata) {
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 3740a9a840..ef455e901d 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -2293,8 +2293,6 @@ _public_ int sd_journal_process(sd_journal *j) {
l -= step;
}
}
-
- return determine_change(j);
}
_public_ int sd_journal_wait(sd_journal *j, uint64_t timeout_usec) {