chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: limit logs in status to current boot
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 15239b5688d8bde6743d80d13f3726b50ff6d77b..cf60ebcee2756e4fe096c31c565d3cdb336fbc8c 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-415,7
+415,7
@@
_public_ void sd_journal_flush_matches(sd_journal *j) {
}
static int compare_entry_order(JournalFile *af, Object *_ao,
}
static int compare_entry_order(JournalFile *af, Object *_ao,
- JournalFile *bf, uint64_t bp) {
+
JournalFile *bf, uint64_t bp) {
uint64_t a, b;
Object *ao, *bo;
uint64_t a, b;
Object *ao, *bo;
@@
-498,7
+498,7
@@
static int compare_entry_order(JournalFile *af, Object *_ao,
return 0;
}
return 0;
}
-static int compare_with_location(JournalFile *af, Object *ao, Location *l) {
+
_pure_
static int compare_with_location(JournalFile *af, Object *ao, Location *l) {
uint64_t a;
assert(af);
uint64_t a;
assert(af);
@@
-1302,7
+1302,7
@@
static int add_file(sd_journal *j, const char *prefix, const char *filename) {
return r;
}
return r;
}
- log_debug("File %s
got
added.", f->path);
+ log_debug("File %s added.", f->path);
check_network(j, f->fd);
check_network(j, f->fd);
@@
-1330,7
+1330,7
@@
static int remove_file(sd_journal *j, const char *prefix, const char *filename)
hashmap_remove(j->files, f->path);
hashmap_remove(j->files, f->path);
- log_debug("File %s
got
removed.", f->path);
+ log_debug("File %s removed.", f->path);
if (j->current_file == f) {
j->current_file = NULL;
if (j->current_file == f) {
j->current_file = NULL;
@@
-1397,7
+1397,7
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
path = NULL; /* avoid freeing in cleanup */
j->current_invalidate_counter ++;
path = NULL; /* avoid freeing in cleanup */
j->current_invalidate_counter ++;
- log_debug("Directory %s
got
added.", m->path);
+ log_debug("Directory %s added.", m->path);
} else if (m->is_root)
return 0;
} else if (m->is_root)
return 0;
@@
-1476,7
+1476,7
@@
static int add_root_directory(sd_journal *j, const char *p) {
j->current_invalidate_counter ++;
j->current_invalidate_counter ++;
- log_debug("Root directory %s
got
added.", m->path);
+ log_debug("Root directory %s added.", m->path);
} else if (!m->is_root)
return 0;
} else if (!m->is_root)
return 0;
@@
-1537,9
+1537,9
@@
static int remove_directory(sd_journal *j, Directory *d) {
hashmap_remove(j->directories_by_path, d->path);
if (d->is_root)
hashmap_remove(j->directories_by_path, d->path);
if (d->is_root)
- log_debug("Root directory %s
got
removed.", d->path);
+ log_debug("Root directory %s removed.", d->path);
else
else
- log_debug("Directory %s
got
removed.", d->path);
+ log_debug("Directory %s removed.", d->path);
free(d->path);
free(d);
free(d->path);
free(d);
@@
-2217,6
+2217,8
@@
_public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
return -EINVAL;
if (!from && !to)
return -EINVAL;
return -EINVAL;
if (!from && !to)
return -EINVAL;
+ if (from == to)
+ return -EINVAL;
HASHMAP_FOREACH(f, j->files, i) {
usec_t fr, t;
HASHMAP_FOREACH(f, j->files, i) {
usec_t fr, t;
@@
-2256,6
+2258,8
@@
_public_ int sd_journal_get_cutoff_monotonic_usec(sd_journal *j, sd_id128_t boot
return -EINVAL;
if (!from && !to)
return -EINVAL;
return -EINVAL;
if (!from && !to)
return -EINVAL;
+ if (from == to)
+ return -EINVAL;
HASHMAP_FOREACH(f, j->files, i) {
usec_t fr, t;
HASHMAP_FOREACH(f, j->files, i) {
usec_t fr, t;