chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-journal: properly parse cursor strings
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 2fa81727e049702bb0d5fae78decf37bded12275..05a8445b3703f0ad737d12eeee3647cf23ec202e 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-983,35
+983,35
@@
_public_ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
case 's':
seqnum_id_set = true;
case 's':
seqnum_id_set = true;
- k = sd_id128_from_string(
w
+2, &seqnum_id);
+ k = sd_id128_from_string(
item
+2, &seqnum_id);
break;
case 'i':
seqnum_set = true;
break;
case 'i':
seqnum_set = true;
- if (sscanf(
w
+2, "%llx", &seqnum) != 1)
+ if (sscanf(
item
+2, "%llx", &seqnum) != 1)
k = -EINVAL;
break;
case 'b':
boot_id_set = true;
k = -EINVAL;
break;
case 'b':
boot_id_set = true;
- k = sd_id128_from_string(
w
+2, &boot_id);
+ k = sd_id128_from_string(
item
+2, &boot_id);
break;
case 'm':
monotonic_set = true;
break;
case 'm':
monotonic_set = true;
- if (sscanf(
w
+2, "%llx", &monotonic) != 1)
+ if (sscanf(
item
+2, "%llx", &monotonic) != 1)
k = -EINVAL;
break;
case 't':
realtime_set = true;
k = -EINVAL;
break;
case 't':
realtime_set = true;
- if (sscanf(
w
+2, "%llx", &realtime) != 1)
+ if (sscanf(
item
+2, "%llx", &realtime) != 1)
k = -EINVAL;
break;
case 'x':
xor_hash_set = true;
k = -EINVAL;
break;
case 'x':
xor_hash_set = true;
- if (sscanf(
w
+2, "%llx", &xor_hash) != 1)
+ if (sscanf(
item
+2, "%llx", &xor_hash) != 1)
k = -EINVAL;
break;
}
k = -EINVAL;
break;
}
@@
-1256,9
+1256,10
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
}
for (;;) {
}
for (;;) {
- struct dirent buf, *de;
+ struct dirent *de;
+ union dirent_storage buf;
- r = readdir_r(d, &buf, &de);
+ r = readdir_r(d, &buf
.de
, &de);
if (r != 0 || !de)
break;
if (r != 0 || !de)
break;
@@
-1334,10
+1335,11
@@
static int add_root_directory(sd_journal *j, const char *p) {
}
for (;;) {
}
for (;;) {
- struct dirent buf, *de;
+ struct dirent *de;
+ union dirent_storage buf;
sd_id128_t id;
sd_id128_t id;
- r = readdir_r(d, &buf, &de);
+ r = readdir_r(d, &buf
.de
, &de);
if (r != 0 || !de)
break;
if (r != 0 || !de)
break;