]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journal: drop unnecessary +1 in newa() expression
authorLennart Poettering <lennart@poettering.net>
Wed, 13 Oct 2021 10:08:20 +0000 (12:08 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 14 Oct 2021 13:57:52 +0000 (15:57 +0200)
newa() does this internally anyway, no need to do this explicitly.

src/libsystemd/sd-journal/journal-file.c

index d5ceba2f8fb1f361d08fbc059f80081130553784..7c88c6614dcb5611e2e472cc35a124e396163469 100644 (file)
@@ -2146,8 +2146,7 @@ int journal_file_append_entry(
                 return r;
 #endif
 
-        /* alloca() can't take 0, hence let's allocate at least one */
-        items = newa(EntryItem, MAX(1u, n_iovec));
+        items = newa(EntryItem, n_iovec);
 
         for (unsigned i = 0; i < n_iovec; i++) {
                 uint64_t p;
@@ -3873,8 +3872,7 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
         boot_id = &o->entry.boot_id;
 
         n = journal_file_entry_n_items(o);
-        /* alloca() can't take 0, hence let's allocate at least one */
-        items = newa(EntryItem, MAX(1u, n));
+        items = newa(EntryItem, n);
 
         for (uint64_t i = 0; i < n; i++) {
                 uint64_t l, h;