journalctl: fix signedness warning and boot-id syntax check

This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2013-07-18 08:07:08 -04:00
parent c265488362
commit a54e3b3d6a
+2 -2
View File
@@ -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;
}