X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fpython-systemd%2F_journal.c;h=456e4a2796bbad2bd8ece51cfeaa033fe0460b2d;hb=7e63dd1015c9ac6fc2042e45b0a87a3f9f8b9336;hp=669c22ce5e6bd71029a19ed376bcf3c14272f8fd;hpb=29804cc1e0f37ee34301530fd7f1eb8550be464e;p=elogind.git

diff --git a/src/python-systemd/_journal.c b/src/python-systemd/_journal.c
index 669c22ce5..456e4a279 100644
--- a/src/python-systemd/_journal.c
+++ b/src/python-systemd/_journal.c
@@ -25,7 +25,7 @@
 #include "util.h"
 
 #define SD_JOURNAL_SUPPRESS_LOCATION
-#include <systemd/sd-journal.h>
+#include "systemd/sd-journal.h"
 
 PyDoc_STRVAR(journal_sendv__doc__,
              "sendv('FIELD=value', 'FIELD=value', ...) -> None\n\n"
@@ -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));
@@ -114,11 +113,9 @@ static PyMethodDef methods[] = {
         { NULL, NULL, 0, NULL }        /* Sentinel */
 };
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 #if PY_MAJOR_VERSION < 3
 
+DISABLE_WARNING_MISSING_PROTOTYPES;
 PyMODINIT_FUNC init_journal(void) {
         PyObject *m;
 
@@ -128,6 +125,7 @@ PyMODINIT_FUNC init_journal(void) {
 
         PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION);
 }
+REENABLE_WARNING;
 
 #else
 
@@ -139,6 +137,7 @@ static struct PyModuleDef module = {
         methods
 };
 
+DISABLE_WARNING_MISSING_PROTOTYPES;
 PyMODINIT_FUNC PyInit__journal(void) {
         PyObject *m;
 
@@ -153,7 +152,6 @@ PyMODINIT_FUNC PyInit__journal(void) {
 
         return m;
 }
+REENABLE_WARNING;
 
 #endif
-
-#pragma GCC diagnostic pop