Remove extraneous (char *) casts.

QuLogic · QuLogic · commit 2d2083c71fbc · 2020-05-20T15:38:05.000-04:00
These functions all take `const char *` already, or return `char *`
directly.
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -67,8 +67,7 @@ _get_transform_mesh(PyObject *py_affine, npy_intp *dims)
     out_dims[0] = dims[0] * dims[1];
     out_dims[1] = 2;
 
-    py_inverse = PyObject_CallMethod(
-        py_affine, (char *)"inverted", (char *)"", NULL);
+    py_inverse = PyObject_CallMethod(py_affine, "inverted", NULL);
     if (py_inverse == NULL) {
         return NULL;
     }
@@ -83,10 +82,8 @@ _get_transform_mesh(PyObject *py_affine, npy_intp *dims)
         }
     }
 
-    PyObject *output_mesh =
-        PyObject_CallMethod(
-            py_inverse, (char *)"transform", (char *)"O",
-            (char *)input_mesh.pyobj_steal(), NULL);
+    PyObject *output_mesh = PyObject_CallMethod(
+        py_inverse, "transform", "O", input_mesh.pyobj_steal());
 
     Py_DECREF(py_inverse);
 
diff --git a/src/mplutils.cpp b/src/mplutils.cpp
@@ -10,7 +10,7 @@ int add_dict_int(PyObject *dict, const char *key, long val)
         return 1;
     }
 
-    if (PyDict_SetItemString(dict, (char *)key, valobj)) {
+    if (PyDict_SetItemString(dict, key, valobj)) {
         Py_DECREF(valobj);
         return 1;
     }
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -406,7 +406,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
         Py_XINCREF(arr);
         m_shape = PyArray_DIMS(m_arr);
         m_strides = PyArray_STRIDES(m_arr);
-        m_data = (char *)PyArray_BYTES(m_arr);
+        m_data = PyArray_BYTES(m_arr);
     }
 
     array_view(npy_intp shape[ND]) : m_arr(NULL), m_shape(NULL), m_strides(NULL), m_data(NULL)
@@ -486,7 +486,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
             m_arr = tmp;
             m_shape = PyArray_DIMS(m_arr);
             m_strides = PyArray_STRIDES(m_arr);
-            m_data = (char *)PyArray_BYTES(tmp);
+            m_data = PyArray_BYTES(tmp);
         }
 
         return true;
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -54,9 +54,9 @@ int convert_from_method(PyObject *obj, const char *name, converter func, void *p
 {
     PyObject *value;
 
-    value = PyObject_CallMethod(obj, (char *)name, NULL);
+    value = PyObject_CallMethod(obj, name, NULL);
     if (value == NULL) {
-        if (!PyObject_HasAttrString(obj, (char *)name)) {
+        if (!PyObject_HasAttrString(obj, name)) {
             PyErr_Clear();
             return 1;
         }
@@ -76,9 +76,9 @@ int convert_from_attr(PyObject *obj, const char *name, converter func, void *p)
 {
     PyObject *value;
 
-    value = PyObject_GetAttrString(obj, (char *)name);
+    value = PyObject_GetAttrString(obj, name);
     if (value == NULL) {
-        if (!PyObject_HasAttrString(obj, (char *)name)) {
+        if (!PyObject_HasAttrString(obj, name)) {
             PyErr_Clear();
             return 1;
         }

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,7 @@ _get_transform_mesh(PyObject py_affine, npy_intp dims)`
`67`	`67`	`out_dims[0] = dims[0] * dims[1];`
`68`	`68`	`out_dims[1] = 2;`
`69`	`69`
`70`		`- py_inverse = PyObject_CallMethod(`
`71`		`- py_affine, (char )"inverted", (char )"", NULL);`
	`70`	`+ py_inverse = PyObject_CallMethod(py_affine, "inverted", NULL);`
`72`	`71`	`if (py_inverse == NULL) {`
`73`	`72`	`return NULL;`
`74`	`73`	`}`
`@@ -83,10 +82,8 @@ _get_transform_mesh(PyObject py_affine, npy_intp dims)`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`
`86`		`- PyObject *output_mesh =`
`87`		`- PyObject_CallMethod(`
`88`		`- py_inverse, (char )"transform", (char )"O",`
`89`		`- (char *)input_mesh.pyobj_steal(), NULL);`
	`85`	`+ PyObject *output_mesh = PyObject_CallMethod(`
	`86`	`+ py_inverse, "transform", "O", input_mesh.pyobj_steal());`
`90`	`87`
`91`	`88`	`Py_DECREF(py_inverse);`
`92`	`89`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ int add_dict_int(PyObject dict, const char key, long val)`
`10`	`10`	`return 1;`
`11`	`11`	`}`
`12`	`12`
`13`		`- if (PyDict_SetItemString(dict, (char *)key, valobj)) {`
	`13`	`+ if (PyDict_SetItemString(dict, key, valobj)) {`
`14`	`14`	`Py_DECREF(valobj);`
`15`	`15`	`return 1;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ int convert_from_method(PyObject obj, const char name, converter func, void *p`
`54`	`54`	`{`
`55`	`55`	`PyObject *value;`
`56`	`56`
`57`		`- value = PyObject_CallMethod(obj, (char *)name, NULL);`
	`57`	`+ value = PyObject_CallMethod(obj, name, NULL);`
`58`	`58`	`if (value == NULL) {`
`59`		`- if (!PyObject_HasAttrString(obj, (char *)name)) {`
	`59`	`+ if (!PyObject_HasAttrString(obj, name)) {`
`60`	`60`	`PyErr_Clear();`
`61`	`61`	`return 1;`
`62`	`62`	`}`
`@@ -76,9 +76,9 @@ int convert_from_attr(PyObject obj, const char name, converter func, void *p)`
`76`	`76`	`{`
`77`	`77`	`PyObject *value;`
`78`	`78`
`79`		`- value = PyObject_GetAttrString(obj, (char *)name);`
	`79`	`+ value = PyObject_GetAttrString(obj, name);`
`80`	`80`	`if (value == NULL) {`
`81`		`- if (!PyObject_HasAttrString(obj, (char *)name)) {`
	`81`	`+ if (!PyObject_HasAttrString(obj, name)) {`
`82`	`82`	`PyErr_Clear();`
`83`	`83`	`return 1;`
`84`	`84`	`}`