From a54e3b3d6a4fe28a39729f4c5ad11cd26706110c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 18 Jul 2013 08:07:01 -0400 Subject: [PATCH] journalctl: fix signedness warning and boot-id syntax check --- src/journal/journalctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } -- 2.30.2