chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: rearrange log function naming
[elogind.git]
/
src
/
journal
/
test-journal-interleaving.c
diff --git
a/src/journal/test-journal-interleaving.c
b/src/journal/test-journal-interleaving.c
index 5b747147827e2cb0643e30451478802b617250dd..23a26c43f633814042e83cfae38fd691efb77f60 100644
(file)
--- a/
src/journal/test-journal-interleaving.c
+++ b/
src/journal/test-journal-interleaving.c
@@
-23,7
+23,7
@@
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
-#include
<systemd/sd-journal.h>
+#include
"systemd/sd-journal.h"
#include "journal-file.h"
#include "journal-internal.h"
#include "journal-file.h"
#include "journal-internal.h"
@@
-37,9
+37,9
@@
static bool arg_keep = false;
noreturn static void log_assert_errno(const char *text, int eno, const char *file, int line, const char *func) {
static bool arg_keep = false;
noreturn static void log_assert_errno(const char *text, int eno, const char *file, int line, const char *func) {
- log_
meta(LOG_CRIT
, file, line, func,
- "'%s' failed at %s:%u (%s): %s.",
- text, file, line, func, strerror(eno));
+ log_
internal(LOG_CRIT, 0
, file, line, func,
+
"'%s' failed at %s:%u (%s): %s.",
+
text, file, line, func, strerror(eno));
abort();
}
abort();
}
@@
-189,7
+189,7
@@
static void test_skip(void (*setup)(void)) {
if (arg_keep)
log_info("Not removing %s", t);
else {
if (arg_keep)
log_info("Not removing %s", t);
else {
- journal_directory_vacuum(".", 3000000, 0,
0, NULL
);
+ journal_directory_vacuum(".", 3000000, 0,
NULL, true
);
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}
@@
-274,7
+274,7
@@
static void test_sequence_numbers(void) {
if (arg_keep)
log_info("Not removing %s", t);
else {
if (arg_keep)
log_info("Not removing %s", t);
else {
- journal_directory_vacuum(".", 3000000, 0,
0, NULL
);
+ journal_directory_vacuum(".", 3000000, 0,
NULL, true
);
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}