dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-23 16:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd-python: some python3 and bug fixes

Browse Source
This commit is contained in:
Steven Hiscocks
2013-02-16 13:40:44 +00:00
committed by Zbigniew Jędrzejewski-Szmek
parent 6a71de70e5
commit bf1ced5503
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/python-systemd/_reader.c
View File

@@ -383,7 +383,7 @@ Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
&offset, &whence))
return NULL;
PyObject *arg;
PyObject *result=NULL;
if (whence == SEEK_SET){
int r;
Py_BEGIN_ALLOW_THREADS
@@ -394,10 +394,10 @@ Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
return NULL;
}
if (offset > 0LL) {
Py_DECREF(PyObject_CallMethod((PyObject *)self, "get_next", "L", offset));
result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
}
}else if (whence == SEEK_CUR){
Py_DECREF(PyObject_CallMethod((PyObject *)self, "get_next", "L", offset));
result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
}else if (whence == SEEK_END){
int r;
Py_BEGIN_ALLOW_THREADS
@@ -407,14 +407,19 @@ Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
PyErr_SetString(PyExc_RuntimeError, "Error seeking to tail");
return NULL;
}
Py_DECREF(PyObject_CallMethod((PyObject *)self, "get_next", "L", -1LL));
if (offset < 0LL) {
Py_DECREF(PyObject_CallMethod((PyObject *)self, "get_next", "L", offset));
result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
}else{
result = PyObject_CallMethod((PyObject *)self, "get_next", "L", -1LL);
}
}else{
PyErr_SetString(PyExc_ValueError, "Invalid value for whence");
return NULL;
}
if (result)
Py_DECREF(result);
if (PyErr_Occurred())
return NULL;
Py_RETURN_NONE;
}
@@ -607,7 +612,7 @@ Journal_iter(PyObject *self)
static PyObject *
Journal_iternext(PyObject *self)
{
PyObject *dict, *arg;
PyObject *dict;
Py_ssize_t dict_size;
dict = PyObject_CallMethod(self, "get_next", "");