chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: convert log_unit_*() to log_unit_*_errno()
[elogind.git]
/
src
/
python-systemd
/
id128.c
diff --git
a/src/python-systemd/id128.c
b/src/python-systemd/id128.c
index 865cc3ce22926e113d5428986272b1f5d511ddde..5ec7309a54a94bef1857d2bf4715ff98c0dff065 100644
(file)
--- a/
src/python-systemd/id128.c
+++ b/
src/python-systemd/id128.c
@@
-19,13
+19,14
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <stdbool.h>
-
#include <Python.h>
#include <Python.h>
-#include
<systemd/sd-messages.h>
+#include
"systemd/sd-messages.h"
#include "pyutil.h"
#include "pyutil.h"
+#include "log.h"
+#include "util.h"
+#include "macro.h"
PyDoc_STRVAR(module__doc__,
"Python interface to the libsystemd-id128 library.\n\n"
PyDoc_STRVAR(module__doc__,
"Python interface to the libsystemd-id128 library.\n\n"
@@
-52,9
+53,9
@@
PyDoc_STRVAR(get_boot__doc__,
);
static PyObject* make_uuid(sd_id128_t id) {
);
static PyObject* make_uuid(sd_id128_t id) {
- PyObject _cleanup_Py_DECREF_
+ _cleanup_Py_DECREF_ PyObject
*uuid = NULL, *UUID = NULL, *bytes = NULL,
*uuid = NULL, *UUID = NULL, *bytes = NULL,
- *args = NULL, *kwargs = NULL
, *obj = NULL
;
+ *args = NULL, *kwargs = NULL;
uuid = PyImport_ImportModule("uuid");
if (!uuid)
uuid = PyImport_ImportModule("uuid");
if (!uuid)
@@
-110,11
+111,9
@@
static int add_id(PyObject *module, const char* name, sd_id128_t id) {
return PyModule_AddObject(module, name, obj);
}
return PyModule_AddObject(module, name, obj);
}
-#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 initid128(void) {
PyObject *m;
PyMODINIT_FUNC initid128(void) {
PyObject *m;
@@
-126,7
+125,9
@@
PyMODINIT_FUNC initid128(void) {
#define JOINER ;
#include "id128-constants.h"
#undef JOINER
#define JOINER ;
#include "id128-constants.h"
#undef JOINER
+ PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION);
}
}
+REENABLE_WARNING;
#else
#else
@@
-138,6
+139,7
@@
static struct PyModuleDef module = {
methods
};
methods
};
+DISABLE_WARNING_MISSING_PROTOTYPES;
PyMODINIT_FUNC PyInit_id128(void) {
PyObject *m;
PyMODINIT_FUNC PyInit_id128(void) {
PyObject *m;
@@
-149,14
+151,13
@@
PyMODINIT_FUNC PyInit_id128(void) {
#define JOINER ||
#include "id128-constants.h"
#undef JOINER
#define JOINER ||
#include "id128-constants.h"
#undef JOINER
-
false
) {
+
PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION)
) {
Py_DECREF(m);
return NULL;
}
return m;
}
Py_DECREF(m);
return NULL;
}
return m;
}
+REENABLE_WARNING;
#endif
#endif
-
-#pragma GCC diagnostic pop