From 6f052eaa1e8e83eb97e0a800f3e9585f587ecd5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Mon, 29 May 2023 09:23:37 +0200 Subject: [PATCH] libmount (python) : simplify struct initialization MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Weißschuh --- libmount/python/context.c | 48 +++++++++------------------------------ libmount/python/fs.c | 48 +++++++++------------------------------ libmount/python/tab.c | 48 +++++++++------------------------------ 3 files changed, 33 insertions(+), 111 deletions(-) diff --git a/libmount/python/context.c b/libmount/python/context.c index 353a893f53..36cf488f83 100644 --- a/libmount/python/context.c +++ b/libmount/python/context.c @@ -1175,43 +1175,17 @@ static PyObject *Context_repr(ContextObjext *self) PyTypeObject ContextType = { PyVarObject_HEAD_INIT(NULL, 0) - "libmount.Context", /*tp_name*/ - sizeof(ContextObjext), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - (destructor)Context_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - NULL, /*tp_getattr*/ - NULL, /*tp_setattr*/ - NULL, /*tp_compare*/ - (reprfunc) Context_repr, - NULL, /*tp_as_number*/ - NULL, /*tp_as_sequence*/ - NULL, /*tp_as_mapping*/ - NULL, /*tp_hash */ - NULL, /*tp_call*/ - NULL, /*tp_str*/ - NULL, /*tp_getattro*/ - NULL, /*tp_setattro*/ - NULL, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - Context_HELP, /* tp_doc */ - NULL, /* tp_traverse */ - NULL, /* tp_clear */ - NULL, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - NULL, /* tp_iter */ - NULL, /* tp_iternext */ - Context_methods, /* tp_methods */ - Context_members, /* tp_members */ - Context_getseters, /* tp_getset */ - NULL, /* tp_base */ - NULL, /* tp_dict */ - NULL, /* tp_descr_get */ - NULL, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)Context_init, /* tp_init */ - NULL, /* tp_alloc */ - Context_new, /* tp_new */ + .tp_name = "libmount.Context", + .tp_basicsize = sizeof(ContextObjext), + .tp_dealloc = (destructor)Context_dealloc, + .tp_repr = (reprfunc) Context_repr, + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + .tp_doc = Context_HELP, + .tp_methods = Context_methods, + .tp_members = Context_members, + .tp_getset = Context_getseters, + .tp_init = (initproc)Context_init, + .tp_new = Context_new, }; void Context_AddModuleObject(PyObject *mod) diff --git a/libmount/python/fs.c b/libmount/python/fs.c index e9891241d5..ccb2460a3f 100644 --- a/libmount/python/fs.c +++ b/libmount/python/fs.c @@ -832,43 +832,17 @@ static PyObject *Fs_copy_fs(FsObject *self, PyObject *args, PyObject *kwds) PyTypeObject FsType = { PyVarObject_HEAD_INIT(NULL, 0) - "libmount.Fs", /*tp_name*/ - sizeof(FsObject), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - (destructor)Fs_destructor, /*tp_dealloc*/ - 0, /*tp_print*/ - NULL, /*tp_getattr*/ - NULL, /*tp_setattr*/ - NULL, /*tp_compare*/ - (reprfunc)Fs_repr, /*tp_repr*/ - NULL, /*tp_as_number*/ - NULL, /*tp_as_sequence*/ - NULL, /*tp_as_mapping*/ - NULL, /*tp_hash */ - NULL, /*tp_call*/ - NULL, /*tp_str*/ - NULL, /*tp_getattro*/ - NULL, /*tp_setattro*/ - NULL, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - Fs_HELP, /* tp_doc */ - NULL, /* tp_traverse */ - NULL, /* tp_clear */ - NULL, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - NULL, /* tp_iter */ - NULL, /* tp_iternext */ - Fs_methods, /* tp_methods */ - Fs_members, /* tp_members */ - Fs_getseters, /* tp_getset */ - NULL, /* tp_base */ - NULL, /* tp_dict */ - NULL, /* tp_descr_get */ - NULL, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)Fs_init, /* tp_init */ - NULL, /* tp_alloc */ - Fs_new, /* tp_new */ + .tp_name = "libmount.Fs", + .tp_basicsize = sizeof(FsObject), + .tp_dealloc = (destructor)Fs_destructor, + .tp_repr = (reprfunc)Fs_repr, + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + .tp_doc = Fs_HELP, + .tp_methods = Fs_methods, + .tp_members = Fs_members, + .tp_getset = Fs_getseters, + .tp_init = (initproc)Fs_init, + .tp_new = Fs_new, }; void FS_AddModuleObject(PyObject *mod) diff --git a/libmount/python/tab.c b/libmount/python/tab.c index 000bc131c3..d33a1fe3b7 100644 --- a/libmount/python/tab.c +++ b/libmount/python/tab.c @@ -731,43 +731,17 @@ static PyObject *Table_repr(TableObject *self) PyTypeObject TableType = { PyVarObject_HEAD_INIT(NULL, 0) - "libmount.Table", /*tp_name*/ - sizeof(TableObject), /*tp_basicsize*/ - 0, /*tp_itemsize*/ - (destructor)Table_destructor, /*tp_dealloc*/ - 0, /*tp_print*/ - NULL, /*tp_getattr*/ - NULL, /*tp_setattr*/ - NULL, /*tp_compare*/ - (reprfunc) Table_repr, /*tp_repr*/ - NULL, /*tp_as_number*/ - NULL, /*tp_as_sequence*/ - NULL, /*tp_as_mapping*/ - NULL, /*tp_hash */ - NULL, /*tp_call*/ - NULL, /*tp_str*/ - NULL, /*tp_getattro*/ - NULL, /*tp_setattro*/ - NULL, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ - Table_HELP, /* tp_doc */ - NULL, /* tp_traverse */ - NULL, /* tp_clear */ - NULL, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - NULL, /* tp_iter */ - NULL, /* tp_iternext */ - Table_methods, /* tp_methods */ - Table_members, /* tp_members */ - Table_getseters, /* tp_getset */ - NULL, /* tp_base */ - NULL, /* tp_dict */ - NULL, /* tp_descr_get */ - NULL, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)Table_init, /* tp_init */ - NULL, /* tp_alloc */ - Table_new, /* tp_new */ + .tp_name = "libmount.Table", + .tp_basicsize = sizeof(TableObject), + .tp_dealloc = (destructor)Table_destructor, + .tp_repr = (reprfunc) Table_repr, + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + .tp_doc = Table_HELP, + .tp_methods = Table_methods, + .tp_members = Table_members, + .tp_getset = Table_getseters, + .tp_init = (initproc)Table_init, + .tp_new = Table_new, }; void Table_AddModuleObject(PyObject *mod) -- 2.47.2