picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

systemd-python: use consistent indentation

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-05-09 18:25:54 -04:00
parent 77b6e19458
commit 04b33f69b6
2 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
src/python-systemd/login.c
View file

@ -142,8 +142,8 @@ static PyTypeObject MonitorType;
static void Monitor_dealloc(Monitor* self)
{
sd_login_monitor_unref(self->monitor);
Py_TYPE(self)->tp_free((PyObject*)self);
sd_login_monitor_unref(self->monitor);
Py_TYPE(self)->tp_free((PyObject*)self);
}
PyDoc_STRVAR(Monitor__doc__,
@ -192,11 +192,11 @@ PyDoc_STRVAR(Monitor_get_events__doc__,
"See man:sd_login_monitor_get_events(3) for further discussion.");
static PyObject* Monitor_get_events(Monitor *self, PyObject *args)
{
int r = sd_login_monitor_get_events(self->monitor);
set_error(r, NULL, NULL);
if (r < 0)
return NULL;
return long_FromLong(r);
int r = sd_login_monitor_get_events(self->monitor);
set_error(r, NULL, NULL);
if (r < 0)
return NULL;
return long_FromLong(r);
}
@ -210,19 +210,19 @@ PyDoc_STRVAR(Monitor_get_timeout__doc__,
"See man:sd_login_monitor_get_timeout(3) for further discussion.");
static PyObject* Monitor_get_timeout(Monitor *self, PyObject *args)
{
int r;
uint64_t t;
int r;
uint64_t t;
r = sd_login_monitor_get_timeout(self->monitor, &t);
set_error(r, NULL, NULL);
if (r < 0)
return NULL;
r = sd_login_monitor_get_timeout(self->monitor, &t);
set_error(r, NULL, NULL);
if (r < 0)
return NULL;
if (t == (uint64_t) -1)
Py_RETURN_NONE;
if (t == (uint64_t) -1)
Py_RETURN_NONE;
assert_cc(sizeof(unsigned long long) == sizeof(t));
return PyLong_FromUnsignedLongLong(t);
assert_cc(sizeof(unsigned long long) == sizeof(t));
return PyLong_FromUnsignedLongLong(t);
}
@ -233,15 +233,15 @@ PyDoc_STRVAR(Monitor_get_timeout_ms__doc__,
"no timeout is necessary.");
static PyObject* Monitor_get_timeout_ms(Monitor *self, PyObject *args)
{
int r;
uint64_t t;
int r;
uint64_t t;
r = sd_login_monitor_get_timeout(self->monitor, &t);
set_error(r, NULL, NULL);
if (r < 0)
return NULL;
r = sd_login_monitor_get_timeout(self->monitor, &t);
set_error(r, NULL, NULL);
if (r < 0)
return NULL;
return absolute_timeout(t);
return absolute_timeout(t);
}
@ -282,11 +282,11 @@ PyDoc_STRVAR(Monitor___enter____doc__,
"Returns self.\n");
static PyObject* Monitor___enter__(PyObject *self, PyObject *args)
{
assert(self);
assert(!args);
assert(self);
assert(!args);
Py_INCREF(self);
return self;
Py_INCREF(self);
return self;
}
@ -301,27 +301,27 @@ static PyObject* Monitor___exit__(Monitor *self, PyObject *args)
static PyMethodDef Monitor_methods[] = {
{"fileno", (PyCFunction) Monitor_fileno, METH_NOARGS, Monitor_fileno__doc__},
{"get_events", (PyCFunction) Monitor_get_events, METH_NOARGS, Monitor_get_events__doc__},
{"get_timeout", (PyCFunction) Monitor_get_timeout, METH_NOARGS, Monitor_get_timeout__doc__},
{"get_timeout_ms", (PyCFunction) Monitor_get_timeout_ms, METH_NOARGS, Monitor_get_timeout_ms__doc__},
{"close", (PyCFunction) Monitor_close, METH_NOARGS, Monitor_close__doc__},
{"flush", (PyCFunction) Monitor_flush, METH_NOARGS, Monitor_flush__doc__},
{"__enter__", (PyCFunction) Monitor___enter__, METH_NOARGS, Monitor___enter____doc__},
{"__exit__", (PyCFunction) Monitor___exit__, METH_VARARGS, Monitor___exit____doc__},
{} /* Sentinel */
{"fileno", (PyCFunction) Monitor_fileno, METH_NOARGS, Monitor_fileno__doc__},
{"get_events", (PyCFunction) Monitor_get_events, METH_NOARGS, Monitor_get_events__doc__},
{"get_timeout", (PyCFunction) Monitor_get_timeout, METH_NOARGS, Monitor_get_timeout__doc__},
{"get_timeout_ms", (PyCFunction) Monitor_get_timeout_ms, METH_NOARGS, Monitor_get_timeout_ms__doc__},
{"close", (PyCFunction) Monitor_close, METH_NOARGS, Monitor_close__doc__},
{"flush", (PyCFunction) Monitor_flush, METH_NOARGS, Monitor_flush__doc__},
{"__enter__", (PyCFunction) Monitor___enter__, METH_NOARGS, Monitor___enter____doc__},
{"__exit__", (PyCFunction) Monitor___exit__, METH_VARARGS, Monitor___exit____doc__},
{} /* Sentinel */
};
static PyTypeObject MonitorType = {
PyVarObject_HEAD_INIT(NULL, 0)
.tp_name = "login.Monitor",
.tp_basicsize = sizeof(Monitor),
.tp_dealloc = (destructor) Monitor_dealloc,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
.tp_doc = Monitor__doc__,
.tp_methods = Monitor_methods,
.tp_init = (initproc) Monitor_init,
.tp_new = PyType_GenericNew,
PyVarObject_HEAD_INIT(NULL, 0)
.tp_name = "login.Monitor",
.tp_basicsize = sizeof(Monitor),
.tp_dealloc = (destructor) Monitor_dealloc,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
.tp_doc = Monitor__doc__,
.tp_methods = Monitor_methods,
.tp_init = (initproc) Monitor_init,
.tp_new = PyType_GenericNew,
};

44
src/python-systemd/pyutil.c
View file

@ -30,31 +30,31 @@ void cleanup_Py_DECREFp(PyObject **p) {
}
PyObject* absolute_timeout(uint64_t t) {
if (t == (uint64_t) -1)
return PyLong_FromLong(-1);
else {
struct timespec ts;
uint64_t n;
int msec;
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;
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 PyLong_FromLong(msec);
}
}
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;
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;
}