]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journal: small simplification
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 29 May 2018 15:01:53 +0000 (17:01 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 31 May 2018 18:42:04 +0000 (20:42 +0200)
src/journal/journal-file.c

index 606ca604acfbee18f3a1b70866102d4c4bef5e19..c9b6466bab7be8def4a0aa1b228a181513a0377a 100644 (file)
@@ -212,7 +212,7 @@ int journal_file_set_offline(JournalFile *f, bool wait) {
         if (!f->writable)
                 return -EPERM;
 
-        if (!(f->fd >= 0 && f->header))
+        if (f->fd < 0 || !f->header)
                 return -EINVAL;
 
         /* An offlining journal is implicitly online and may modify f->header->state,
@@ -269,7 +269,7 @@ static int journal_file_set_online(JournalFile *f) {
         if (!f->writable)
                 return -EPERM;
 
-        if (!(f->fd >= 0 && f->header))
+        if (f->fd < 0 || !f->header)
                 return -EINVAL;
 
         while (wait) {