chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timesyncd: minor simplification
[elogind.git]
/
src
/
python-systemd
/
_journal.c
diff --git
a/src/python-systemd/_journal.c
b/src/python-systemd/_journal.c
index f8e0b4f7f29e661700bd1b9d0d6c7a7d7499d0a6..456e4a2796bbad2bd8ece51cfeaa033fe0460b2d 100644
(file)
--- a/
src/python-systemd/_journal.c
+++ b/
src/python-systemd/_journal.c
@@
-22,9
+22,10
@@
#include <Python.h>
#include <alloca.h>
#include <Python.h>
#include <alloca.h>
+#include "util.h"
#define SD_JOURNAL_SUPPRESS_LOCATION
#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"
PyDoc_STRVAR(journal_sendv__doc__,
"sendv('FIELD=value', 'FIELD=value', ...) -> None\n\n"
@@
-40,8
+41,7
@@
static PyObject *journal_sendv(PyObject *self, PyObject *args) {
/* Allocate an array for the argument strings */
argc = PyTuple_Size(args);
/* Allocate an array for the argument strings */
argc = PyTuple_Size(args);
- encoded = alloca(argc * sizeof(PyObject*));
- memset(encoded, 0, argc * sizeof(PyObject*));
+ encoded = alloca0(argc * sizeof(PyObject*));
/* Allocate sufficient iovector space for the arguments. */
iov = alloca(argc * sizeof(struct iovec));
/* Allocate sufficient iovector space for the arguments. */
iov = alloca(argc * sizeof(struct iovec));
@@
-113,11
+113,9
@@
static PyMethodDef methods[] = {
{ NULL, NULL, 0, NULL } /* Sentinel */
};
{ NULL, NULL, 0, NULL } /* Sentinel */
};
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
#if PY_MAJOR_VERSION < 3
#if PY_MAJOR_VERSION < 3
+DISABLE_WARNING_MISSING_PROTOTYPES;
PyMODINIT_FUNC init_journal(void) {
PyObject *m;
PyMODINIT_FUNC init_journal(void) {
PyObject *m;
@@
-127,6
+125,7
@@
PyMODINIT_FUNC init_journal(void) {
PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION);
}
PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION);
}
+REENABLE_WARNING;
#else
#else
@@
-138,6
+137,7
@@
static struct PyModuleDef module = {
methods
};
methods
};
+DISABLE_WARNING_MISSING_PROTOTYPES;
PyMODINIT_FUNC PyInit__journal(void) {
PyObject *m;
PyMODINIT_FUNC PyInit__journal(void) {
PyObject *m;
@@
-152,7
+152,6
@@
PyMODINIT_FUNC PyInit__journal(void) {
return m;
}
return m;
}
+REENABLE_WARNING;
#endif
#endif
-
-#pragma GCC diagnostic pop