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-dhcp: message_init - only set secs in the client
[elogind.git]
/
src
/
journal
/
journal-file.c
diff --git
a/src/journal/journal-file.c
b/src/journal/journal-file.c
index b3747e37e4fbcd58b94b36d6581ab899254be4ad..23c4d28e730482ff715085beb6bfe03338c61510 100644
(file)
--- a/
src/journal/journal-file.c
+++ b/
src/journal/journal-file.c
@@
-560,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);
@@
-586,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);
@@
-1012,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);