X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fpython-systemd%2F_reader.c;h=224a9169e6d00a9f290a0038c5ee99218c6a535f;hp=b8365977466f3f19d5c31a22d6d89a29d323432a;hb=f0f2e63bb2d5cd27e6a2464ee46a670a3159c5da;hpb=7f876bc4281145e6c74e98de07c6648a5b51ed90 diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c index b83659774..224a9169e 100644 --- a/src/python-systemd/_reader.c +++ b/src/python-systemd/_reader.c @@ -30,6 +30,8 @@ #include "pyutil.h" #include "macro.h" #include "util.h" +#include "strv.h" +#include "build.h" typedef struct { PyObject_HEAD @@ -37,20 +39,6 @@ typedef struct { } Reader; static PyTypeObject ReaderType; -static int set_error(int r, const char* path, const char* invalid_message) { - if (r >= 0) - return r; - if (r == -EINVAL && invalid_message) - PyErr_SetString(PyExc_ValueError, invalid_message); - else if (r == -ENOMEM) - PyErr_SetString(PyExc_MemoryError, "Not enough memory"); - else { - errno = -r; - PyErr_SetFromErrnoWithFilename(PyExc_OSError, path); - } - return -1; -} - PyDoc_STRVAR(module__doc__, "Class to reads the systemd journal similar to journalctl."); @@ -76,48 +64,115 @@ static PyStructSequence_Desc Monotonic_desc = { }; #endif +/** + * Convert a Python sequence object into a strv (char**), and + * None into a NULL pointer. + */ +static int strv_converter(PyObject* obj, void *_result) { + char ***result = _result; + Py_ssize_t i, len; -static void Reader_dealloc(Reader* self) -{ + assert(result); + + if (!obj) + return 0; + + if (obj == Py_None) { + *result = NULL; + return 1; + } + + if (!PySequence_Check(obj)) + return 0; + + len = PySequence_Length(obj); + *result = new0(char*, len + 1); + if (!*result) { + set_error(-ENOMEM, NULL, NULL); + return 0; + } + + for (i = 0; i < len; i++) { + PyObject *item; +#if PY_MAJOR_VERSION >=3 && PY_MINOR_VERSION >= 1 + int r; + PyObject *bytes; +#endif + char *s, *s2; + + item = PySequence_ITEM(obj, i); +#if PY_MAJOR_VERSION >=3 && PY_MINOR_VERSION >= 1 + r = PyUnicode_FSConverter(item, &bytes); + if (r == 0) + goto cleanup; + + s = PyBytes_AsString(bytes); +#else + s = PyString_AsString(item); +#endif + if (!s) + goto cleanup; + + s2 = strdup(s); + if (!s2) + log_oom(); + + (*result)[i] = s2; + } + + return 1; + +cleanup: + strv_free(*result); + *result = NULL; + + return 0; +} + +static void Reader_dealloc(Reader* self) { sd_journal_close(self->j); Py_TYPE(self)->tp_free((PyObject*)self); } PyDoc_STRVAR(Reader__doc__, - "_Reader([flags | path]) -> ...\n\n" + "_Reader([flags | path | files]) -> ...\n\n" "_Reader allows filtering and retrieval of Journal entries.\n" "Note: this is a low-level interface, and probably not what you\n" "want, use systemd.journal.Reader instead.\n\n" "Argument `flags` sets open flags of the journal, which can be one\n" "of, or ORed combination of constants: LOCAL_ONLY (default) opens\n" "journal on local machine only; RUNTIME_ONLY opens only\n" - "volatile journal files; and SYSTEM_ONLY opens only\n" - "journal files of system services and the kernel.\n\n" - "Argument `path` is the directory of journal files. Note that\n" - "`flags` and `path` are exclusive.\n\n" + "volatile journal files; and SYSTEM opens journal files of\n" + "system services and the kernel, and CURRENT_USER opens files\n" + "of the current user.\n\n" + "Argument `path` is the directory of journal files.\n" + "Argument `files` is a list of files. Note that\n" + "`flags`, `path`, and `files` are exclusive.\n\n" "_Reader implements the context manager protocol: the journal\n" "will be closed when exiting the block."); -static int Reader_init(Reader *self, PyObject *args, PyObject *keywds) -{ +static int Reader_init(Reader *self, PyObject *args, PyObject *keywds) { int flags = 0, r; char *path = NULL; + char **files = NULL; + + static const char* const kwlist[] = {"flags", "path", "files", NULL}; + if (!PyArg_ParseTupleAndKeywords(args, keywds, "|izO&:__init__", (char**) kwlist, + &flags, &path, strv_converter, &files)) + return -1; - static const char* const kwlist[] = {"flags", "path", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, keywds, "|iz", (char**) kwlist, - &flags, &path)) + if (!!flags + !!path + !!files > 1) { + PyErr_SetString(PyExc_ValueError, "cannot use more than one of flags, path, and files"); return -1; + } if (!flags) flags = SD_JOURNAL_LOCAL_ONLY; - else - if (path) { - PyErr_SetString(PyExc_ValueError, "cannot use both flags and path"); - return -1; - } Py_BEGIN_ALLOW_THREADS if (path) r = sd_journal_open_directory(&self->j, path, 0); + else if (files) + r = sd_journal_open_files(&self->j, (const char**) files, 0); else r = sd_journal_open(&self->j, flags); Py_END_ALLOW_THREADS @@ -131,8 +186,7 @@ PyDoc_STRVAR(Reader_fileno__doc__, "Get a file descriptor to poll for changes in the journal.\n" "This method invokes sd_journal_get_fd().\n" "See man:sd_journal_get_fd(3)."); -static PyObject* Reader_fileno(Reader *self, PyObject *args) -{ +static PyObject* Reader_fileno(Reader *self, PyObject *args) { int fd = sd_journal_get_fd(self->j); set_error(fd, NULL, NULL); if (fd < 0) @@ -146,11 +200,9 @@ PyDoc_STRVAR(Reader_reliable_fd__doc__, "Returns True iff the journal can be polled reliably.\n" "This method invokes sd_journal_reliable_fd().\n" "See man:sd_journal_reliable_fd(3)."); -static PyObject* Reader_reliable_fd(Reader *self, PyObject *args) -{ +static PyObject* Reader_reliable_fd(Reader *self, PyObject *args) { int r = sd_journal_reliable_fd(self->j); - set_error(r, NULL, NULL); - if (r < 0) + if (set_error(r, NULL, NULL) < 0) return NULL; return PyBool_FromLong(r); } @@ -161,11 +213,9 @@ PyDoc_STRVAR(Reader_get_events__doc__, "Returns a mask of poll() events to wait for on the file\n" "descriptor returned by .fileno().\n\n" "See man:sd_journal_get_events(3) for further discussion."); -static PyObject* Reader_get_events(Reader *self, PyObject *args) -{ +static PyObject* Reader_get_events(Reader *self, PyObject *args) { int r = sd_journal_get_events(self->j); - set_error(r, NULL, NULL); - if (r < 0) + if (set_error(r, NULL, NULL) < 0) return NULL; return long_FromLong(r); } @@ -176,17 +226,15 @@ PyDoc_STRVAR(Reader_get_timeout__doc__, "Returns a timeout value for usage in poll(), the time since the\n" "epoch of clock_gettime(2) in microseconds, or None if no timeout\n" "is necessary.\n\n" - "The return value must be converted to a relative timeout in \n" + "The return value must be converted to a relative timeout in\n" "milliseconds if it is to be used as an argument for poll().\n" "See man:sd_journal_get_timeout(3) for further discussion."); -static PyObject* Reader_get_timeout(Reader *self, PyObject *args) -{ +static PyObject* Reader_get_timeout(Reader *self, PyObject *args) { int r; uint64_t t; r = sd_journal_get_timeout(self->j, &t); - set_error(r, NULL, NULL); - if (r < 0) + if (set_error(r, NULL, NULL) < 0) return NULL; if (t == (uint64_t) -1) @@ -202,29 +250,15 @@ PyDoc_STRVAR(Reader_get_timeout_ms__doc__, "Returns a timeout value suitable for usage in poll(), the value\n" "returned by .get_timeout() converted to relative ms, or -1 if\n" "no timeout is necessary."); -static PyObject* Reader_get_timeout_ms(Reader *self, PyObject *args) -{ +static PyObject* Reader_get_timeout_ms(Reader *self, PyObject *args) { int r; uint64_t t; r = sd_journal_get_timeout(self->j, &t); - set_error(r, NULL, NULL); - if (r < 0) + if (set_error(r, NULL, NULL) < 0) return NULL; - if (t == (uint64_t) -1) - return PyLong_FromLong(-1); - else { - struct timespec ts; - uint64_t n; - int msec; - - clock_gettime(CLOCK_MONOTONIC, &ts); - n = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000; - msec = t > n ? (int) ((t - n + 999) / 1000) : 0; - - return PyLong_FromLong(msec); - } + return absolute_timeout(t); } @@ -233,8 +267,7 @@ PyDoc_STRVAR(Reader_close__doc__, "Free resources allocated by this Reader object.\n" "This method invokes sd_journal_close().\n" "See man:sd_journal_close(3)."); -static PyObject* Reader_close(Reader *self, PyObject *args) -{ +static PyObject* Reader_close(Reader *self, PyObject *args) { assert(self); assert(!args); @@ -253,13 +286,12 @@ PyDoc_STRVAR(Reader_get_usage__doc__, "of all hosts.\n\n" "This method invokes sd_journal_get_usage().\n" "See man:sd_journal_get_usage(3)."); -static PyObject* Reader_get_usage(Reader *self, PyObject *args) -{ +static PyObject* Reader_get_usage(Reader *self, PyObject *args) { int r; uint64_t bytes; r = sd_journal_get_usage(self->j, &bytes); - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; assert_cc(sizeof(unsigned long long) == sizeof(bytes)); @@ -271,8 +303,7 @@ PyDoc_STRVAR(Reader___enter____doc__, "__enter__() -> self\n\n" "Part of the context manager protocol.\n" "Returns self.\n"); -static PyObject* Reader___enter__(PyObject *self, PyObject *args) -{ +static PyObject* Reader___enter__(PyObject *self, PyObject *args) { assert(self); assert(!args); @@ -284,13 +315,8 @@ PyDoc_STRVAR(Reader___exit____doc__, "__exit__(type, value, traceback) -> None\n\n" "Part of the context manager protocol.\n" "Closes the journal.\n"); -static PyObject* Reader___exit__(Reader *self, PyObject *args) -{ - assert(self); - - sd_journal_close(self->j); - self->j = NULL; - Py_RETURN_NONE; +static PyObject* Reader___exit__(Reader *self, PyObject *args) { + return Reader_close(self, args); } @@ -299,8 +325,7 @@ PyDoc_STRVAR(Reader_next__doc__, "Go to the next log entry. Optional skip value means to go to\n" "the `skip`\\-th log entry.\n" "Returns False if at end of file, True otherwise."); -static PyObject* Reader_next(Reader *self, PyObject *args) -{ +static PyObject* Reader_next(Reader *self, PyObject *args) { int64_t skip = 1LL; int r; @@ -325,8 +350,7 @@ static PyObject* Reader_next(Reader *self, PyObject *args) assert_not_reached("should not be here"); Py_END_ALLOW_THREADS - set_error(r, NULL, NULL); - if (r < 0) + if (set_error(r, NULL, NULL) < 0) return NULL; return PyBool_FromLong(r); } @@ -336,8 +360,7 @@ PyDoc_STRVAR(Reader_previous__doc__, "Go to the previous log entry. Optional skip value means to \n" "go to the `skip`\\-th previous log entry.\n" "Returns False if at start of file, True otherwise."); -static PyObject* Reader_previous(Reader *self, PyObject *args) -{ +static PyObject* Reader_previous(Reader *self, PyObject *args) { int64_t skip = 1LL; if (!PyArg_ParseTuple(args, "|L:previous", &skip)) return NULL; @@ -386,8 +409,7 @@ PyDoc_STRVAR(Reader_get__doc__, "get(str) -> str\n\n" "Return data associated with this key in current log entry.\n" "Throws KeyError is the data is not available."); -static PyObject* Reader_get(Reader *self, PyObject *args) -{ +static PyObject* Reader_get(Reader *self, PyObject *args) { const char* field; const void* msg; size_t msg_len; @@ -404,7 +426,8 @@ static PyObject* Reader_get(Reader *self, PyObject *args) if (r == -ENOENT) { PyErr_SetString(PyExc_KeyError, field); return NULL; - } else if (set_error(r, NULL, "field name is not valid")) + } + if (set_error(r, NULL, "field name is not valid") < 0) return NULL; r = extract(msg, msg_len, NULL, &value); @@ -417,8 +440,7 @@ static PyObject* Reader_get(Reader *self, PyObject *args) PyDoc_STRVAR(Reader_get_all__doc__, "_get_all() -> dict\n\n" "Return dictionary of the current log entry."); -static PyObject* Reader_get_all(Reader *self, PyObject *args) -{ +static PyObject* Reader_get_all(Reader *self, PyObject *args) { PyObject *dict; const void *msg; size_t msg_len; @@ -480,8 +502,7 @@ PyDoc_STRVAR(Reader_get_realtime__doc__, "in microseconds.\n\n" "Wraps sd_journal_get_realtime_usec().\n" "See man:sd_journal_get_realtime_usec(3)."); -static PyObject* Reader_get_realtime(Reader *self, PyObject *args) -{ +static PyObject* Reader_get_realtime(Reader *self, PyObject *args) { uint64_t timestamp; int r; @@ -489,7 +510,7 @@ static PyObject* Reader_get_realtime(Reader *self, PyObject *args) assert(!args); r = sd_journal_get_realtime_usec(self->j, ×tamp); - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; assert_cc(sizeof(unsigned long long) == sizeof(timestamp)); @@ -503,8 +524,7 @@ PyDoc_STRVAR(Reader_get_monotonic__doc__, "as a tuple of time in microseconds and bootid.\n\n" "Wraps sd_journal_get_monotonic_usec().\n" "See man:sd_journal_get_monotonic_usec(3)."); -static PyObject* Reader_get_monotonic(Reader *self, PyObject *args) -{ +static PyObject* Reader_get_monotonic(Reader *self, PyObject *args) { uint64_t timestamp; sd_id128_t id; PyObject *monotonic, *bootid, *tuple; @@ -514,7 +534,7 @@ static PyObject* Reader_get_monotonic(Reader *self, PyObject *args) assert(!args); r = sd_journal_get_monotonic_usec(self->j, ×tamp, &id); - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; assert_cc(sizeof(unsigned long long) == sizeof(timestamp)); @@ -549,16 +569,14 @@ PyDoc_STRVAR(Reader_add_match__doc__, "fields are combined with logical AND, and matches of the same field\n" "are automatically combined with logical OR.\n" "Match is a string of the form \"FIELD=value\"."); -static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds) -{ +static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds) { char *match; int match_len, r; if (!PyArg_ParseTuple(args, "s#:add_match", &match, &match_len)) return NULL; r = sd_journal_add_match(self->j, match, match_len); - set_error(r, NULL, "Invalid match"); - if (r < 0) + if (set_error(r, NULL, "Invalid match") < 0) return NULL; Py_RETURN_NONE; @@ -571,12 +589,10 @@ PyDoc_STRVAR(Reader_add_disjunction__doc__, "add_disjunction() or add_conjunction() and the next\n" "add_disjunction() or add_conjunction().\n\n" "See man:sd_journal_add_disjunction(3) for explanation."); -static PyObject* Reader_add_disjunction(Reader *self, PyObject *args) -{ +static PyObject* Reader_add_disjunction(Reader *self, PyObject *args) { int r; r = sd_journal_add_disjunction(self->j); - set_error(r, NULL, NULL); - if (r < 0) + if (set_error(r, NULL, NULL) < 0) return NULL; Py_RETURN_NONE; } @@ -588,12 +604,10 @@ PyDoc_STRVAR(Reader_add_conjunction__doc__, "add_disjunction() or add_conjunction() and the next\n" "add_disjunction() or add_conjunction().\n\n" "See man:sd_journal_add_disjunction(3) for explanation."); -static PyObject* Reader_add_conjunction(Reader *self, PyObject *args) -{ +static PyObject* Reader_add_conjunction(Reader *self, PyObject *args) { int r; r = sd_journal_add_conjunction(self->j); - set_error(r, NULL, NULL); - if (r < 0) + if (set_error(r, NULL, NULL) < 0) return NULL; Py_RETURN_NONE; } @@ -602,8 +616,7 @@ static PyObject* Reader_add_conjunction(Reader *self, PyObject *args) PyDoc_STRVAR(Reader_flush_matches__doc__, "flush_matches() -> None\n\n" "Clear all current match filters."); -static PyObject* Reader_flush_matches(Reader *self, PyObject *args) -{ +static PyObject* Reader_flush_matches(Reader *self, PyObject *args) { sd_journal_flush_matches(self->j); Py_RETURN_NONE; } @@ -614,13 +627,12 @@ PyDoc_STRVAR(Reader_seek_head__doc__, "Jump to the beginning of the journal.\n" "This method invokes sd_journal_seek_head().\n" "See man:sd_journal_seek_head(3)."); -static PyObject* Reader_seek_head(Reader *self, PyObject *args) -{ +static PyObject* Reader_seek_head(Reader *self, PyObject *args) { int r; Py_BEGIN_ALLOW_THREADS r = sd_journal_seek_head(self->j); Py_END_ALLOW_THREADS - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; Py_RETURN_NONE; } @@ -631,13 +643,12 @@ PyDoc_STRVAR(Reader_seek_tail__doc__, "Jump to the end of the journal.\n" "This method invokes sd_journal_seek_tail().\n" "See man:sd_journal_seek_tail(3)."); -static PyObject* Reader_seek_tail(Reader *self, PyObject *args) -{ +static PyObject* Reader_seek_tail(Reader *self, PyObject *args) { int r; Py_BEGIN_ALLOW_THREADS r = sd_journal_seek_tail(self->j); Py_END_ALLOW_THREADS - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; Py_RETURN_NONE; } @@ -647,8 +658,7 @@ PyDoc_STRVAR(Reader_seek_realtime__doc__, "seek_realtime(realtime) -> None\n\n" "Seek to nearest matching journal entry to `realtime`. Argument\n" "`realtime` in specified in seconds."); -static PyObject* Reader_seek_realtime(Reader *self, PyObject *args) -{ +static PyObject* Reader_seek_realtime(Reader *self, PyObject *args) { uint64_t timestamp; int r; @@ -658,7 +668,7 @@ static PyObject* Reader_seek_realtime(Reader *self, PyObject *args) Py_BEGIN_ALLOW_THREADS r = sd_journal_seek_realtime_usec(self->j, timestamp); Py_END_ALLOW_THREADS - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; Py_RETURN_NONE; } @@ -670,8 +680,7 @@ PyDoc_STRVAR(Reader_seek_monotonic__doc__, "`monotonic` is an timestamp from boot in microseconds.\n" "Argument `bootid` is a string representing which boot the\n" "monotonic time is reference to. Defaults to current bootid."); -static PyObject* Reader_seek_monotonic(Reader *self, PyObject *args) -{ +static PyObject* Reader_seek_monotonic(Reader *self, PyObject *args) { char *bootid = NULL; uint64_t timestamp; sd_id128_t id; @@ -682,20 +691,20 @@ static PyObject* Reader_seek_monotonic(Reader *self, PyObject *args) if (bootid) { r = sd_id128_from_string(bootid, &id); - if (set_error(r, NULL, "Invalid bootid")) + if (set_error(r, NULL, "Invalid bootid") < 0) return NULL; } else { Py_BEGIN_ALLOW_THREADS r = sd_id128_get_boot(&id); Py_END_ALLOW_THREADS - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; } Py_BEGIN_ALLOW_THREADS r = sd_journal_seek_monotonic_usec(self->j, id, timestamp); Py_END_ALLOW_THREADS - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; Py_RETURN_NONE; @@ -710,8 +719,7 @@ PyDoc_STRVAR(Reader_process__doc__, "entries have been added to the end of the journal; and\n" "INVALIDATE if journal files have been added or removed.\n\n" "See man:sd_journal_process(3) for further discussion."); -static PyObject* Reader_process(Reader *self, PyObject *args) -{ +static PyObject* Reader_process(Reader *self, PyObject *args) { int r; assert(!args); @@ -736,8 +744,7 @@ PyDoc_STRVAR(Reader_wait__doc__, "entries have been added to the end of the journal; and\n" "INVALIDATE if journal files have been added or removed.\n\n" "See man:sd_journal_wait(3) for further discussion."); -static PyObject* Reader_wait(Reader *self, PyObject *args) -{ +static PyObject* Reader_wait(Reader *self, PyObject *args) { int r; int64_t timeout; @@ -757,8 +764,7 @@ static PyObject* Reader_wait(Reader *self, PyObject *args) PyDoc_STRVAR(Reader_seek_cursor__doc__, "seek_cursor(cursor) -> None\n\n" "Seek to journal entry by given unique reference `cursor`."); -static PyObject* Reader_seek_cursor(Reader *self, PyObject *args) -{ +static PyObject* Reader_seek_cursor(Reader *self, PyObject *args) { const char *cursor; int r; @@ -768,7 +774,7 @@ static PyObject* Reader_seek_cursor(Reader *self, PyObject *args) Py_BEGIN_ALLOW_THREADS r = sd_journal_seek_cursor(self->j, cursor); Py_END_ALLOW_THREADS - if (set_error(r, NULL, "Invalid cursor")) + if (set_error(r, NULL, "Invalid cursor") < 0) return NULL; Py_RETURN_NONE; } @@ -778,8 +784,7 @@ PyDoc_STRVAR(Reader_get_cursor__doc__, "get_cursor() -> str\n\n" "Return a cursor string for the current journal entry.\n\n" "Wraps sd_journal_get_cursor(). See man:sd_journal_get_cursor(3)."); -static PyObject* Reader_get_cursor(Reader *self, PyObject *args) -{ +static PyObject* Reader_get_cursor(Reader *self, PyObject *args) { _cleanup_free_ char *cursor = NULL; int r; @@ -787,7 +792,7 @@ static PyObject* Reader_get_cursor(Reader *self, PyObject *args) assert(!args); r = sd_journal_get_cursor(self->j, &cursor); - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; return unicode_FromString(cursor); @@ -798,8 +803,7 @@ PyDoc_STRVAR(Reader_test_cursor__doc__, "test_cursor(str) -> bool\n\n" "Test whether the cursor string matches current journal entry.\n\n" "Wraps sd_journal_test_cursor(). See man:sd_journal_test_cursor(3)."); -static PyObject* Reader_test_cursor(Reader *self, PyObject *args) -{ +static PyObject* Reader_test_cursor(Reader *self, PyObject *args) { const char *cursor; int r; @@ -810,8 +814,7 @@ static PyObject* Reader_test_cursor(Reader *self, PyObject *args) return NULL; r = sd_journal_test_cursor(self->j, cursor); - set_error(r, NULL, NULL); - if (r < 0) + if (set_error(r, NULL, NULL) < 0) return NULL; return PyBool_FromLong(r); @@ -821,8 +824,7 @@ PyDoc_STRVAR(Reader_query_unique__doc__, "query_unique(field) -> a set of values\n\n" "Return a set of unique values appearing in journal for the\n" "given `field`. Note this does not respect any journal matches."); -static PyObject* Reader_query_unique(Reader *self, PyObject *args) -{ +static PyObject* Reader_query_unique(Reader *self, PyObject *args) { char *query; int r; const void *uniq; @@ -835,7 +837,7 @@ static PyObject* Reader_query_unique(Reader *self, PyObject *args) Py_BEGIN_ALLOW_THREADS r = sd_journal_query_unique(self->j, query); Py_END_ALLOW_THREADS - if (set_error(r, NULL, "Invalid field name")) + if (set_error(r, NULL, "Invalid field name") < 0) return NULL; value_set = PySet_New(0); @@ -863,8 +865,7 @@ PyDoc_STRVAR(Reader_get_catalog__doc__, "and KeyError is the id is specified, but hasn't been found\n" "in the catalog.\n\n" "Wraps man:sd_journal_get_catalog(3)."); -static PyObject* Reader_get_catalog(Reader *self, PyObject *args) -{ +static PyObject* Reader_get_catalog(Reader *self, PyObject *args) { int r; _cleanup_free_ char *msg = NULL; @@ -880,16 +881,17 @@ static PyObject* Reader_get_catalog(Reader *self, PyObject *args) r = sd_journal_get_data(self->j, "MESSAGE_ID", &mid, &mid_len); if (r == 0) { - const int l = sizeof("MESSAGE_ID"); + const size_t l = sizeof("MESSAGE_ID"); assert(mid_len > l); - PyErr_Format(PyExc_KeyError, "%.*s", (int) mid_len - l, + PyErr_Format(PyExc_KeyError, "%.*s", (int) (mid_len - l), (const char*) mid + l); } else if (r == -ENOENT) PyErr_SetString(PyExc_IndexError, "no MESSAGE_ID field"); else set_error(r, NULL, NULL); return NULL; - } else if (set_error(r, NULL, NULL)) + } + if (set_error(r, NULL, NULL) < 0) return NULL; return unicode_FromString(msg); @@ -900,8 +902,7 @@ PyDoc_STRVAR(get_catalog__doc__, "get_catalog(id128) -> str\n\n" "Retrieve a message catalog entry for the given id.\n" "Wraps man:sd_journal_get_catalog_for_message_id(3)."); -static PyObject* get_catalog(PyObject *self, PyObject *args) -{ +static PyObject* get_catalog(PyObject *self, PyObject *args) { int r; char *id_ = NULL; sd_id128_t id; @@ -914,13 +915,13 @@ static PyObject* get_catalog(PyObject *self, PyObject *args) return NULL; r = sd_id128_from_string(id_, &id); - if (set_error(r, NULL, "Invalid id128")) + if (set_error(r, NULL, "Invalid id128") < 0) return NULL; Py_BEGIN_ALLOW_THREADS r = sd_journal_get_catalog_for_message_id(id, &msg); Py_END_ALLOW_THREADS - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; return unicode_FromString(msg); @@ -932,20 +933,18 @@ PyDoc_STRVAR(data_threshold__doc__, "Fields longer than this will be truncated to the threshold size.\n" "Defaults to 64Kb."); -static PyObject* Reader_get_data_threshold(Reader *self, void *closure) -{ +static PyObject* Reader_get_data_threshold(Reader *self, void *closure) { size_t cvalue; int r; r = sd_journal_get_data_threshold(self->j, &cvalue); - if (set_error(r, NULL, NULL)) + if (set_error(r, NULL, NULL) < 0) return NULL; return long_FromSize_t(cvalue); } -static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closure) -{ +static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closure) { int r; if (value == NULL) { PyErr_SetString(PyExc_AttributeError, "Cannot delete data threshold"); @@ -962,8 +961,7 @@ static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closur PyDoc_STRVAR(closed__doc__, "True iff journal is closed"); -static PyObject* Reader_get_closed(Reader *self, void *closure) -{ +static PyObject* Reader_get_closed(Reader *self, void *closure) { return PyBool_FromLong(self->j == NULL); } @@ -1018,48 +1016,20 @@ static PyMethodDef Reader_methods[] = { static PyTypeObject ReaderType = { PyVarObject_HEAD_INIT(NULL, 0) - "_reader._Reader", /*tp_name*/ - sizeof(Reader), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - (destructor)Reader_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - 0, /*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - 0, /*tp_repr*/ - 0, /*tp_as_number*/ - 0, /*tp_as_sequence*/ - 0, /*tp_as_mapping*/ - 0, /*tp_hash */ - 0, /*tp_call*/ - 0, /*tp_str*/ - 0, /*tp_getattro*/ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - Reader__doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - Reader_methods, /* tp_methods */ - 0, /* tp_members */ - Reader_getsetters, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc) Reader_init, /* tp_init */ - 0, /* tp_alloc */ - PyType_GenericNew, /* tp_new */ + .tp_name = "_reader._Reader", + .tp_basicsize = sizeof(Reader), + .tp_dealloc = (destructor) Reader_dealloc, + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + .tp_doc = Reader__doc__, + .tp_methods = Reader_methods, + .tp_getset = Reader_getsetters, + .tp_init = (initproc) Reader_init, + .tp_new = PyType_GenericNew, }; static PyMethodDef methods[] = { { "_get_catalog", get_catalog, METH_VARARGS, get_catalog__doc__}, - { NULL, NULL, 0, NULL } /* Sentinel */ + {} /* Sentinel */ }; #if PY_MAJOR_VERSION >= 3 @@ -1069,7 +1039,6 @@ static PyModuleDef module = { module__doc__, -1, methods, - NULL, NULL, NULL, NULL }; #endif @@ -1077,8 +1046,7 @@ static PyModuleDef module = { static bool initialized = false; #endif -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wmissing-prototypes" +DISABLE_WARNING_MISSING_PROTOTYPES; PyMODINIT_FUNC #if PY_MAJOR_VERSION >= 3 @@ -1126,7 +1094,10 @@ init_reader(void) PyModule_AddIntConstant(m, "INVALIDATE", SD_JOURNAL_INVALIDATE) || PyModule_AddIntConstant(m, "LOCAL_ONLY", SD_JOURNAL_LOCAL_ONLY) || PyModule_AddIntConstant(m, "RUNTIME_ONLY", SD_JOURNAL_RUNTIME_ONLY) || - PyModule_AddIntConstant(m, "SYSTEM_ONLY", SD_JOURNAL_SYSTEM_ONLY)) { + PyModule_AddIntConstant(m, "SYSTEM", SD_JOURNAL_SYSTEM) || + PyModule_AddIntConstant(m, "SYSTEM_ONLY", SD_JOURNAL_SYSTEM_ONLY) || + PyModule_AddIntConstant(m, "CURRENT_USER", SD_JOURNAL_CURRENT_USER) || + PyModule_AddStringConstant(m, "__version__", PACKAGE_VERSION)) { #if PY_MAJOR_VERSION >= 3 Py_DECREF(m); return NULL; @@ -1138,4 +1109,4 @@ init_reader(void) #endif } -#pragma GCC diagnostic pop +REENABLE_WARNING;