util-lib: split out allocation calls into alloc-util.[ch]

[thirdparty/systemd.git] / src / journal / test-journal-flush.c

diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c
index 40ede4a926d92eff60ba5848fab2116ec737d0c6..03d1522e235b2536ac37ab156d1a3f23f0285647 100644 (file)
--- a/src/journal/test-journal-flush.c
+++ b/src/journal/test-journal-flush.c
@@ -22,12 +22,16 @@
 #include <fcntl.h>
 
 #include "sd-journal.h"
+
+#include "alloc-util.h"
 #include "journal-file.h"
 #include "journal-internal.h"
+#include "macro.h"
+#include "string-util.h"
 
 int main(int argc, char *argv[]) {
-
-        char dn[] = "/var/tmp/test-journal-flush.XXXXXX", *fn;
+        _cleanup_free_ char *fn = NULL;
+        char dn[] = "/var/tmp/test-journal-flush.XXXXXX";
         JournalFile *new_journal = NULL;
         sd_journal *j = NULL;
         unsigned n = 0;
@@ -49,13 +53,13 @@ int main(int argc, char *argv[]) {
                 JournalFile *f;
 
                 f = j->current_file;
-                assert(f && f->current_offset > 0);
+                assert_se(f && f->current_offset > 0);
 
                 r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
-                assert(r >= 0);
+                assert_se(r >= 0);
 
                 r = journal_file_copy_entry(f, new_journal, o, f->current_offset, NULL, NULL, NULL);
-                assert(r >= 0);
+                assert_se(r >= 0);
 
                 n++;
                 if (n > 10000)