X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=python%2F_libvserver.c;h=fc2e7b1835b905fce6a466f6059a01ffc634b321;hb=5b4184f854cb12f32149608868295e847191ef4a;hp=53a46d8c928b2937954c7cfa30d05bef1be78b12;hpb=a9d382cc8a8730ec87fa826f8c104e8deb20e8a4;p=util-vserver.git diff --git a/python/_libvserver.c b/python/_libvserver.c index 53a46d8..fc2e7b1 100644 --- a/python/_libvserver.c +++ b/python/_libvserver.c @@ -163,7 +163,7 @@ pyvserver_set_cflags(PyObject UNUSED *self, PyObject *args) xid_t xid; struct vc_ctx_flags flags; - if (!PyArg_ParseTuple(args, "I(KK)", &xid, flags.flagword, flags.mask)) + if (!PyArg_ParseTuple(args, "I(KK)", &xid, &flags.flagword, &flags.mask)) return NULL; if (vc_set_cflags(xid, &flags) == -1) @@ -591,6 +591,7 @@ pyvserver_get_vhi_name(PyObject UNUSED *self, PyObject *args) xid_t xid; vc_uts_type type; char val[65]; + int i; if (!PyArg_ParseTuple(args, "Ii", &xid, &type)) return NULL; @@ -598,7 +599,10 @@ pyvserver_get_vhi_name(PyObject UNUSED *self, PyObject *args) if (vc_get_vhi_name(xid, type, val, sizeof(val)) == -1) return PyErr_SetFromErrno(PyExc_OSError); - return Py_BuildValue("s#", val, sizeof(val)); + for (i = sizeof(val); i > 0 && val[i - 1] == '\0'; i--) + ; + + return Py_BuildValue("s#", val, i); } static PyObject * @@ -1136,10 +1140,28 @@ PyModule_AddLongLongConstant(PyObject *mod, const char *str, long long val) return; } +#if PY_MAJOR_VERSION == 2 PyMODINIT_FUNC init_libvserver(void) { PyObject *mod; mod = Py_InitModule("_libvserver", methods); #include "_libvserver-constants.c" + return mod; +} +#else +PyMODINIT_FUNC +PyInit__libvserver(void) +{ + static struct PyModuleDef lvmodule = { + PyModuleDef_HEAD_INIT, + "_libvserver", + NULL, + -1, + methods + }; + PyObject *mod = PyModule_Create(&lvmodule); +#include "_libvserver-constants.c" + return mod; } +#endif