chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-event: fix typo
[elogind.git]
/
src
/
python-systemd
/
_journal.c
diff --git
a/src/python-systemd/_journal.c
b/src/python-systemd/_journal.c
index d27178d666e1003a4c027ed4fcdbf4e67a9385b4..456e4a2796bbad2bd8ece51cfeaa033fe0460b2d 100644
(file)
--- a/
src/python-systemd/_journal.c
+++ b/
src/python-systemd/_journal.c
@@
-3,7
+3,7
@@
/***
This file is part of systemd.
/***
This file is part of systemd.
- Copyright 2012 David Strauss
+ Copyright 2012 David Strauss
<david@davidstrauss.net>
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@
-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,14
+113,19
@@
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) {
PyMODINIT_FUNC init_journal(void) {
- (void) Py_InitModule("_journal", methods);
+ PyObject *m;
+
+ m = Py_InitModule("_journal", methods);
+ if (m == NULL)
+ return;
+
+ PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION);
}
}
+REENABLE_WARNING;
#else
#else
@@
-128,14
+133,25
@@
static struct PyModuleDef module = {
PyModuleDef_HEAD_INIT,
"_journal", /* name of module */
NULL, /* module documentation, may be NULL */
PyModuleDef_HEAD_INIT,
"_journal", /* name of module */
NULL, /* module documentation, may be NULL */
-
0
, /* size of per-interpreter state of the module */
+
-1
, /* size of per-interpreter state of the module */
methods
};
methods
};
+DISABLE_WARNING_MISSING_PROTOTYPES;
PyMODINIT_FUNC PyInit__journal(void) {
PyMODINIT_FUNC PyInit__journal(void) {
- return PyModule_Create(&module);
-}
+ PyObject *m;
+
+ m = PyModule_Create(&module);
+ if (m == NULL)
+ return NULL;
-#pragma GCC diagnostic pop
+ if (PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION)) {
+ Py_DECREF(m);
+ return NULL;
+ }
+
+ return m;
+}
+REENABLE_WARNING;
#endif
#endif