system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-06 08:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

journalctl: rename boot_id_t to BootId

Browse source 
So far we tried to reserve the _t suffix to types we use like a value in
contrast to types we use as objects, hence let's do this in journalctl
too.
This commit is contained in:
Lennart Poettering 2015-05-19 00:24:27 +02:00
parent 26b9f165c3
commit 45bc27b621
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/journal/journalctl.c
View file

@ -125,12 +125,12 @@ static enum {
ACTION_VACUUM,
} arg_action = ACTION_SHOW;
typedef struct boot_id_t {
typedef struct BootId {
sd_id128_t id;
uint64_t first;
uint64_t last;
LIST_FIELDS(struct boot_id_t, boot_list);
} boot_id_t;
LIST_FIELDS(struct BootId, boot_list);
} BootId;
static void pager_open_if_enabled(void) {
@ -858,13 +858,15 @@ static int add_matches(sd_journal *j, char **args) {
return 0;
}
static int discover_next_boot(sd_journal *j,
boot_id_t **boot,
bool advance_older,
bool read_realtime) {
static int discover_next_boot(
sd_journal *j,
BootId **boot,
bool advance_older,
bool read_realtime) {
int r;
char match[9+32+1] = "_BOOT_ID=";
_cleanup_free_ boot_id_t *next_boot = NULL;
_cleanup_free_ BootId *next_boot = NULL;
assert(j);
assert(boot);
@ -889,7 +891,7 @@ static int discover_next_boot(sd_journal *j,
else if (r == 0)
return 0; /* End of journal, yay. */
next_boot = new0(boot_id_t, 1);
next_boot = new0(BootId, 1);
if (!next_boot)
return log_oom();
@ -936,13 +938,15 @@ static int discover_next_boot(sd_journal *j,
return 0;
}
static int get_boots(sd_journal *j,
boot_id_t **boots,
boot_id_t *query_ref_boot,
int ref_boot_offset) {
static int get_boots(
sd_journal *j,
BootId **boots,
BootId *query_ref_boot,
int ref_boot_offset) {
bool skip_once;
int r, count = 0;
boot_id_t *head = NULL, *tail = NULL;
BootId *head = NULL, *tail = NULL;
const bool advance_older = query_ref_boot && ref_boot_offset <= 0;
assert(j);
@ -997,12 +1001,12 @@ static int get_boots(sd_journal *j,
/* No sd_journal_next/previous here. */
}
while (true) {
_cleanup_free_ boot_id_t *current = NULL;
for (;;) {
_cleanup_free_ BootId *current = NULL;
r = discover_next_boot(j, &current, advance_older, !query_ref_boot);
if (r < 0) {
boot_id_t *id, *id_next;
BootId *id, *id_next;
LIST_FOREACH_SAFE(boot_list, id, id_next, head)
free(id);
return r;
@ -1040,7 +1044,7 @@ finish:
static int list_boots(sd_journal *j) {
int w, i, count;
boot_id_t *id, *id_next, *all_ids;
BootId *id, *id_next, *all_ids;
assert(j);
@ -1072,7 +1076,7 @@ static int list_boots(sd_journal *j) {
static int add_boot(sd_journal *j) {
char match[9+32+1] = "_BOOT_ID=";
int r;
boot_id_t ref_boot_id = {};
BootId ref_boot_id = {};
assert(j);