Compare commits
3 Commits
5b90e5f3f5
...
12c829376a
Author | SHA1 | Date |
---|---|---|
Zbigniew Jędrzejewski-Szmek | 12c829376a | |
Thibault Nélis | 2c54acb112 | |
Marko Myllynen | de52000695 |
|
@ -356,7 +356,7 @@ const char *special_glyph(SpecialGlyph code) {
|
||||||
[SPECIAL_GLYPH_SLIGHTLY_HAPPY_SMILEY] = ":-)",
|
[SPECIAL_GLYPH_SLIGHTLY_HAPPY_SMILEY] = ":-)",
|
||||||
[SPECIAL_GLYPH_NEUTRAL_SMILEY] = ":-|",
|
[SPECIAL_GLYPH_NEUTRAL_SMILEY] = ":-|",
|
||||||
[SPECIAL_GLYPH_SLIGHTLY_UNHAPPY_SMILEY] = ":-(",
|
[SPECIAL_GLYPH_SLIGHTLY_UNHAPPY_SMILEY] = ":-(",
|
||||||
[SPECIAL_GLYPH_UNHAPPY_SMILEY] = ":-{️",
|
[SPECIAL_GLYPH_UNHAPPY_SMILEY] = ":-{",
|
||||||
[SPECIAL_GLYPH_DEPRESSED_SMILEY] = ":-[",
|
[SPECIAL_GLYPH_DEPRESSED_SMILEY] = ":-[",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -3065,26 +3065,26 @@ void journal_file_print_header(JournalFile *f) {
|
||||||
assert(f);
|
assert(f);
|
||||||
assert(f->header);
|
assert(f->header);
|
||||||
|
|
||||||
printf("File Path: %s\n"
|
printf("File path: %s\n"
|
||||||
"File ID: %s\n"
|
"File ID: %s\n"
|
||||||
"Machine ID: %s\n"
|
"Machine ID: %s\n"
|
||||||
"Boot ID: %s\n"
|
"Boot ID: %s\n"
|
||||||
"Sequential Number ID: %s\n"
|
"Sequential number ID: %s\n"
|
||||||
"State: %s\n"
|
"State: %s\n"
|
||||||
"Compatible Flags:%s%s\n"
|
"Compatible flags:%s%s\n"
|
||||||
"Incompatible Flags:%s%s%s\n"
|
"Incompatible flags:%s%s%s\n"
|
||||||
"Header size: %"PRIu64"\n"
|
"Header size: %"PRIu64"\n"
|
||||||
"Arena size: %"PRIu64"\n"
|
"Arena size: %"PRIu64"\n"
|
||||||
"Data Hash Table Size: %"PRIu64"\n"
|
"Data hash table size: %"PRIu64"\n"
|
||||||
"Field Hash Table Size: %"PRIu64"\n"
|
"Field hash table size: %"PRIu64"\n"
|
||||||
"Rotate Suggested: %s\n"
|
"Rotate suggested: %s\n"
|
||||||
"Head Sequential Number: %"PRIu64" (%"PRIx64")\n"
|
"Head sequential number: %"PRIu64" (%"PRIx64")\n"
|
||||||
"Tail Sequential Number: %"PRIu64" (%"PRIx64")\n"
|
"Tail sequential number: %"PRIu64" (%"PRIx64")\n"
|
||||||
"Head Realtime Timestamp: %s (%"PRIx64")\n"
|
"Head realtime timestamp: %s (%"PRIx64")\n"
|
||||||
"Tail Realtime Timestamp: %s (%"PRIx64")\n"
|
"Tail realtime timestamp: %s (%"PRIx64")\n"
|
||||||
"Tail Monotonic Timestamp: %s (%"PRIx64")\n"
|
"Tail monotonic timestamp: %s (%"PRIx64")\n"
|
||||||
"Objects: %"PRIu64"\n"
|
"Objects: %"PRIu64"\n"
|
||||||
"Entry Objects: %"PRIu64"\n",
|
"Entry objects: %"PRIu64"\n",
|
||||||
f->path,
|
f->path,
|
||||||
sd_id128_to_string(f->header->file_id, a),
|
sd_id128_to_string(f->header->file_id, a),
|
||||||
sd_id128_to_string(f->header->machine_id, b),
|
sd_id128_to_string(f->header->machine_id, b),
|
||||||
|
@ -3112,22 +3112,22 @@ void journal_file_print_header(JournalFile *f) {
|
||||||
le64toh(f->header->n_entries));
|
le64toh(f->header->n_entries));
|
||||||
|
|
||||||
if (JOURNAL_HEADER_CONTAINS(f->header, n_data))
|
if (JOURNAL_HEADER_CONTAINS(f->header, n_data))
|
||||||
printf("Data Objects: %"PRIu64"\n"
|
printf("Data objects: %"PRIu64"\n"
|
||||||
"Data Hash Table Fill: %.1f%%\n",
|
"Data hash table fill: %.1f%%\n",
|
||||||
le64toh(f->header->n_data),
|
le64toh(f->header->n_data),
|
||||||
100.0 * (double) le64toh(f->header->n_data) / ((double) (le64toh(f->header->data_hash_table_size) / sizeof(HashItem))));
|
100.0 * (double) le64toh(f->header->n_data) / ((double) (le64toh(f->header->data_hash_table_size) / sizeof(HashItem))));
|
||||||
|
|
||||||
if (JOURNAL_HEADER_CONTAINS(f->header, n_fields))
|
if (JOURNAL_HEADER_CONTAINS(f->header, n_fields))
|
||||||
printf("Field Objects: %"PRIu64"\n"
|
printf("Field objects: %"PRIu64"\n"
|
||||||
"Field Hash Table Fill: %.1f%%\n",
|
"Field hash table fill: %.1f%%\n",
|
||||||
le64toh(f->header->n_fields),
|
le64toh(f->header->n_fields),
|
||||||
100.0 * (double) le64toh(f->header->n_fields) / ((double) (le64toh(f->header->field_hash_table_size) / sizeof(HashItem))));
|
100.0 * (double) le64toh(f->header->n_fields) / ((double) (le64toh(f->header->field_hash_table_size) / sizeof(HashItem))));
|
||||||
|
|
||||||
if (JOURNAL_HEADER_CONTAINS(f->header, n_tags))
|
if (JOURNAL_HEADER_CONTAINS(f->header, n_tags))
|
||||||
printf("Tag Objects: %"PRIu64"\n",
|
printf("Tag objects: %"PRIu64"\n",
|
||||||
le64toh(f->header->n_tags));
|
le64toh(f->header->n_tags));
|
||||||
if (JOURNAL_HEADER_CONTAINS(f->header, n_entry_arrays))
|
if (JOURNAL_HEADER_CONTAINS(f->header, n_entry_arrays))
|
||||||
printf("Entry Array Objects: %"PRIu64"\n",
|
printf("Entry array objects: %"PRIu64"\n",
|
||||||
le64toh(f->header->n_entry_arrays));
|
le64toh(f->header->n_entry_arrays));
|
||||||
|
|
||||||
if (fstat(f->fd, &st) >= 0)
|
if (fstat(f->fd, &st) >= 0)
|
||||||
|
|
|
@ -528,7 +528,7 @@ static int write_temporary_shadow(const char *shadow_path, FILE **tmpfile, char
|
||||||
.sp_max = -1,
|
.sp_max = -1,
|
||||||
.sp_warn = -1,
|
.sp_warn = -1,
|
||||||
.sp_inact = -1,
|
.sp_inact = -1,
|
||||||
.sp_expire = i->uid == 0 ? -1 : 1, /* lock account as a whole, unless this is root */
|
.sp_expire = -1,
|
||||||
.sp_flag = (unsigned long) -1, /* this appears to be what everybody does ... */
|
.sp_flag = (unsigned long) -1, /* this appears to be what everybody does ... */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue