misc: do not use plain 0 as NULL [smatch scan]

text-utils/tailf.c:69:21: warning: Using plain integer as NULL pointer

Since many 'struct option' has used zero as NULL make them more readable in
same go by reindenting, and using named argument requirements.

Reference: https://lwn.net/Articles/93577/
Signed-off-by: Sami Kerola <kerolasa@iki.fi>

4 files changed, 70 insertions, 70 deletions

diff --git a/libmount/python/context.c b/libmount/python/context.c
index 8256e87c9..6d82e1432 100644
--- a/libmount/python/context.c
+++ b/libmount/python/context.c
@@ -1179,38 +1179,38 @@ PyTypeObject ContextType = {
 	sizeof(ContextObjext), /*tp_basicsize*/
 	0, /*tp_itemsize*/
 	(destructor)Context_dealloc, /*tp_dealloc*/
-	0, /*tp_print*/
-	0, /*tp_getattr*/
-	0, /*tp_setattr*/
-	0, /*tp_compare*/
+	NULL, /*tp_print*/
+	NULL, /*tp_getattr*/
+	NULL, /*tp_setattr*/
+	NULL, /*tp_compare*/
 	(reprfunc) Context_repr,
-	0, /*tp_as_number*/
-	0, /*tp_as_sequence*/
-	0, /*tp_as_mapping*/
-	0, /*tp_hash */
-	0, /*tp_call*/
-	0, /*tp_str*/
-	0, /*tp_getattro*/
-	0, /*tp_setattro*/
-	0, /*tp_as_buffer*/
+	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 */
-	0, /* tp_traverse */
-	0, /* tp_clear */
-	0, /* tp_richcompare */
+	NULL, /* tp_traverse */
+	NULL, /* tp_clear */
+	NULL, /* tp_richcompare */
 	0, /* tp_weaklistoffset */
-	0, /* tp_iter */
-	0, /* tp_iternext */
+	NULL, /* tp_iter */
+	NULL, /* tp_iternext */
 	Context_methods, /* tp_methods */
 	Context_members, /* tp_members */
 	Context_getseters, /* tp_getset */
-	0, /* tp_base */
-	0, /* tp_dict */
-	0, /* tp_descr_get */
-	0, /* tp_descr_set */
+	NULL, /* tp_base */
+	NULL, /* tp_dict */
+	NULL, /* tp_descr_get */
+	NULL, /* tp_descr_set */
 	0, /* tp_dictoffset */
 	(initproc)Context_init, /* tp_init */
-	0, /* tp_alloc */
+	NULL, /* tp_alloc */
 	Context_new, /* tp_new */
 };
 
diff --git a/libmount/python/fs.c b/libmount/python/fs.c
index ca1ce2ada..872a9f29e 100644
--- a/libmount/python/fs.c
+++ b/libmount/python/fs.c
@@ -803,38 +803,38 @@ PyTypeObject FsType = {
 	sizeof(FsObject), /*tp_basicsize*/
 	0, /*tp_itemsize*/
 	(destructor)Fs_destructor, /*tp_dealloc*/
-	0, /*tp_print*/
-	0, /*tp_getattr*/
-	0, /*tp_setattr*/
-	0, /*tp_compare*/
+	NULL, /*tp_print*/
+	NULL, /*tp_getattr*/
+	NULL, /*tp_setattr*/
+	NULL, /*tp_compare*/
 	(reprfunc)Fs_repr, /*tp_repr*/
-	0, /*tp_as_number*/
-	0, /*tp_as_sequence*/
-	0, /*tp_as_mapping*/
-	0, /*tp_hash */
-	0, /*tp_call*/
-	0, /*tp_str*/
-	0, /*tp_getattro*/
-	0, /*tp_setattro*/
-	0, /*tp_as_buffer*/
+	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 */
-	0, /* tp_traverse */
-	0, /* tp_clear */
-	0, /* tp_richcompare */
+	NULL, /* tp_traverse */
+	NULL, /* tp_clear */
+	NULL, /* tp_richcompare */
 	0, /* tp_weaklistoffset */
-	0, /* tp_iter */
-	0, /* tp_iternext */
+	NULL, /* tp_iter */
+	NULL, /* tp_iternext */
 	Fs_methods, /* tp_methods */
 	Fs_members, /* tp_members */
 	Fs_getseters, /* tp_getset */
-	0, /* tp_base */
-	0, /* tp_dict */
-	0, /* tp_descr_get */
-	0, /* tp_descr_set */
+	NULL, /* tp_base */
+	NULL, /* tp_dict */
+	NULL, /* tp_descr_get */
+	NULL, /* tp_descr_set */
 	0, /* tp_dictoffset */
 	(initproc)Fs_init, /* tp_init */
-	0, /* tp_alloc */
+	NULL, /* tp_alloc */
 	Fs_new, /* tp_new */
 };
 
diff --git a/libmount/python/pylibmount.c b/libmount/python/pylibmount.c
index 61dace7d4..a2e128684 100644
--- a/libmount/python/pylibmount.c
+++ b/libmount/python/pylibmount.c
@@ -210,7 +210,7 @@ PyMODINIT_FUNC initpylibmount(void)
 
 		pylibmount_debug_mask = 0;
 		if (str)
-			pylibmount_debug_mask = strtoul(str, 0, 0);
+			pylibmount_debug_mask = strtoul(str, NULL, 0);
 
 		pylibmount_debug_mask |= PYMNT_DEBUG_INIT;
 	}
diff --git a/libmount/python/tab.c b/libmount/python/tab.c
index a77c5cb0c..5fb7140d9 100644
--- a/libmount/python/tab.c
+++ b/libmount/python/tab.c
@@ -733,38 +733,38 @@ PyTypeObject TableType = {
 	sizeof(TableObject), /*tp_basicsize*/
 	0, /*tp_itemsize*/
 	(destructor)Table_destructor, /*tp_dealloc*/
-	0, /*tp_print*/
-	0, /*tp_getattr*/
-	0, /*tp_setattr*/
-	0, /*tp_compare*/
+	NULL, /*tp_print*/
+	NULL, /*tp_getattr*/
+	NULL, /*tp_setattr*/
+	NULL, /*tp_compare*/
 	(reprfunc) Table_repr, /*tp_repr*/
-	0, /*tp_as_number*/
-	0, /*tp_as_sequence*/
-	0, /*tp_as_mapping*/
-	0, /*tp_hash */
-	0, /*tp_call*/
-	0, /*tp_str*/
-	0, /*tp_getattro*/
-	0, /*tp_setattro*/
-	0, /*tp_as_buffer*/
+	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 */
-	0, /* tp_traverse */
-	0, /* tp_clear */
-	0, /* tp_richcompare */
+	NULL, /* tp_traverse */
+	NULL, /* tp_clear */
+	NULL, /* tp_richcompare */
 	0, /* tp_weaklistoffset */
-	0, /* tp_iter */
-	0, /* tp_iternext */
+	NULL, /* tp_iter */
+	NULL, /* tp_iternext */
 	Table_methods, /* tp_methods */
 	Table_members, /* tp_members */
 	Table_getseters, /* tp_getset */
-	0, /* tp_base */
-	0, /* tp_dict */
-	0, /* tp_descr_get */
-	0, /* tp_descr_set */
+	NULL, /* tp_base */
+	NULL, /* tp_dict */
+	NULL, /* tp_descr_get */
+	NULL, /* tp_descr_set */
 	0, /* tp_dictoffset */
 	(initproc)Table_init, /* tp_init */
-	0, /* tp_alloc */
+	NULL, /* tp_alloc */
 	Table_new, /* tp_new */
 };