chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: add networkd-wait-online
[elogind.git]
/
src
/
journal
/
journal-file.c
diff --git
a/src/journal/journal-file.c
b/src/journal/journal-file.c
index 275324b672e554be629af524f3175de73d2671b6..5876733598c46326134463eb6dea3e2a9d5790d2 100644
(file)
--- a/
src/journal/journal-file.c
+++ b/
src/journal/journal-file.c
@@
-419,7
+419,6
@@
int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Objec
void *t;
Object *o;
uint64_t s;
void *t;
Object *o;
uint64_t s;
- unsigned context;
assert(f);
assert(ret);
assert(f);
assert(ret);
@@
-428,10
+427,8
@@
int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Objec
if (!VALID64(offset))
return -EFAULT;
if (!VALID64(offset))
return -EFAULT;
- /* One context for each type, plus one catch-all for the rest */
- context = type > 0 && type < _OBJECT_TYPE_MAX ? type : 0;
- r = journal_file_move_to(f,
context
, false, offset, sizeof(ObjectHeader), &t);
+ r = journal_file_move_to(f,
type_to_context(type)
, false, offset, sizeof(ObjectHeader), &t);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-563,7
+560,7
@@
static int journal_file_setup_data_hash_table(JournalFile *f) {
if (r < 0)
return r;
if (r < 0)
return r;
- mem
set(o->hash_table.items, 0
, s);
+ mem
zero(o->hash_table.items
, s);
f->header->data_hash_table_offset = htole64(p + offsetof(Object, hash_table.items));
f->header->data_hash_table_size = htole64(s);
f->header->data_hash_table_offset = htole64(p + offsetof(Object, hash_table.items));
f->header->data_hash_table_size = htole64(s);
@@
-589,7
+586,7
@@
static int journal_file_setup_field_hash_table(JournalFile *f) {
if (r < 0)
return r;
if (r < 0)
return r;
- mem
set(o->hash_table.items, 0
, s);
+ mem
zero(o->hash_table.items
, s);
f->header->field_hash_table_offset = htole64(p + offsetof(Object, hash_table.items));
f->header->field_hash_table_size = htole64(s);
f->header->field_hash_table_offset = htole64(p + offsetof(Object, hash_table.items));
f->header->field_hash_table_size = htole64(s);
@@
-1015,8
+1012,8
@@
static int journal_file_append_data(
else
eq = memchr(data, '=', size);
if (eq && eq > data) {
else
eq = memchr(data, '=', size);
if (eq && eq > data) {
+ Object *fo = NULL;
uint64_t fp;
uint64_t fp;
- Object *fo;
/* Create field object ... */
r = journal_file_append_field(f, data, (uint8_t*) eq - (uint8_t*) data, &fo, &fp);
/* Create field object ... */
r = journal_file_append_field(f, data, (uint8_t*) eq - (uint8_t*) data, &fo, &fp);
@@
-2213,8
+2210,6
@@
int journal_file_move_to_entry_by_monotonic_for_data(
z = q;
}
z = q;
}
-
- return 0;
}
int journal_file_move_to_entry_by_seqnum_for_data(
}
int journal_file_move_to_entry_by_seqnum_for_data(