marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libbtrfsutil: Convert to designated initialization for BtrfsUtilError_type 

[BUG]
When compiling btrfs-progs with libbtrfsutil on a python3.8 system, we
got the following warning:

  error.c:169:2: warning: initialization of ‘long int’ from ‘void *’ makes integer from pointer without a cast [-Wint-conversion]
    169 |  NULL,      /* tp_print */
        |  ^~~~
  error.c:169:2: note: (near initialization for ‘BtrfsUtilError_type.tp_vectorcall_offset’)

[CAUSE]
C definition of PyTypeObject changed in python 3.8.
Now at the old tp_print, we have tp_vectorcall_offset.

So we got above warning.

[FIX]
C has designated initialization, which can assign values to each named
member, without hard coding to match the offset.
Also, uninitialized values will be 0, so we can also save a lot of
unneeded "= 0" or "= NULL" lines.

Just use that awesome feature to avoid any future breakage.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Qu Wenruo 2019-11-18 14:30:50 +08:00 committed by David Sterba
parent 36128dff44
commit a528cbeead
1 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libbtrfsutil/python/error.c
View File

@ -162,41 +162,16 @@ static PyMemberDef BtrfsUtilError_members[] = {
PyTypeObject BtrfsUtilError_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"btrfsutil.BtrfsUtilError", /* tp_name */
sizeof(BtrfsUtilError), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)BtrfsUtilError_dealloc, /* tp_dealloc */
NULL, /* tp_print */
NULL, /* tp_getattr */
NULL, /* tp_setattr */
NULL, /* tp_as_async */
NULL, /* tp_repr */
NULL, /* tp_as_number */
NULL, /* tp_as_sequence */
NULL, /* tp_as_mapping */
NULL, /* tp_hash */
NULL, /* tp_call */
(reprfunc)BtrfsUtilError_str, /* tp_str */
NULL, /* tp_getattro */
NULL, /* tp_setattro */
NULL, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /* tp_flags */
BtrfsUtilError_DOC, /* tp_doc */
(traverseproc)BtrfsUtilError_traverse, /* tp_traverse */
(inquiry)BtrfsUtilError_clear, /* tp_clear */
NULL, /* tp_richcompare */
0, /* tp_weaklistoffset */
NULL, /* tp_iter */
NULL, /* tp_iternext */
NULL, /* tp_methods */
BtrfsUtilError_members, /* tp_members */
NULL, /* tp_getset */
NULL, /* tp_base */
NULL, /* tp_dict */
NULL, /* tp_descr_get */
NULL, /* tp_descr_set */
offsetof(BtrfsUtilError, os_error.dict), /* tp_dictoffset */
NULL, /* tp_init */
NULL, /* tp_alloc */
BtrfsUtilError_new, /* tp_new */
.tp_name = "btrfsutil.BtrfsUtilError",
.tp_basicsize = sizeof(BtrfsUtilError),
.tp_dealloc = (destructor)BtrfsUtilError_dealloc,
.tp_str = (reprfunc)BtrfsUtilError_str,
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
Py_TPFLAGS_HAVE_GC,
.tp_doc = BtrfsUtilError_DOC,
.tp_traverse = (traverseproc)BtrfsUtilError_traverse,
.tp_clear = (inquiry)BtrfsUtilError_clear,
.tp_members = BtrfsUtilError_members,
.tp_dictoffset = offsetof(BtrfsUtilError, os_error.dict),
.tp_new = BtrfsUtilError_new,
};