From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 31 Jan 2014 11:27:35 +0000 (+0100)
Subject: util: use alloca0() intead of alloca() + memzero()
X-Git-Tag: v209~267
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fb818b2ea194ec182aa3e776d38883dc615910a1

util: use alloca0() intead of alloca() + memzero()
---

diff --git a/src/python-systemd/_journal.c b/src/python-systemd/_journal.c
index 669c22ce5..8cc6d3e52 100644
--- a/src/python-systemd/_journal.c
+++ b/src/python-systemd/_journal.c
@@ -41,8 +41,7 @@ static PyObject *journal_sendv(PyObject *self, PyObject *args) {
 
         /* Allocate an array for the argument strings */
         argc = PyTuple_Size(args);
-        encoded = alloca(argc * sizeof(PyObject*));
-        memzero(encoded, argc * sizeof(PyObject*));
+        encoded = alloca0(argc * sizeof(PyObject*));
 
         /* Allocate sufficient iovector space for the arguments. */
         iov = alloca(argc * sizeof(struct iovec));
diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
index 211ef957d..be920062d 100644
--- a/src/readahead/readahead-collect.c
+++ b/src/readahead/readahead-collect.c
@@ -129,8 +129,7 @@ static int pack_file(FILE *pack, const char *fn, bool on_btrfs) {
         }
 
         pages = l / page_size();
-        vec = alloca(pages);
-        memzero(vec, pages);
+        vec = alloca0(pages);
         if (mincore(start, l, vec) < 0) {
                 log_warning("mincore(%s) failed: %m", fn);
                 r = -errno;