From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 18 Jul 2013 12:07:01 +0000 (-0400)
Subject: journalctl: fix signedness warning and boot-id syntax check
X-Git-Tag: v206~45
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a54e3b3d6a4fe28a39729f4c5ad11cd26706110c;hp=c2654883624885696edccd2a202873998ec208f1

journalctl: fix signedness warning and boot-id syntax check
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 9a40d69a7..2f043a48d 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -744,7 +744,7 @@ static int get_relative_boot_id(sd_journal *j, sd_id128_t *boot_id, int relative
 
                 if (!id ||
                     relative <= 0 ? (id - all_ids) + relative < 0 :
-                                    (id - all_ids) + relative >= count)
+                                    (id - all_ids) + relative >= (int) count)
                         return -EADDRNOTAVAIL;
 
                 *boot_id = (id + relative)->id;
@@ -781,7 +781,7 @@ static int add_boot(sd_journal *j) {
 
                 offset = arg_boot_descriptor + 32;
 
-                if (*offset != '-' && *offset != '+') {
+                if (*offset && *offset != '-' && *offset != '+') {
                         log_error("Relative boot ID offset must start with a '+' or a '-', found '%s' ", offset);
                         return -EINVAL;
                 }