Removed redundant casts to `char *`.

Corresponding functions now accept `const char *` (issue #1772673).
This commit is contained in:
Serhiy Storchaka 2014-09-28 11:27:24 +03:00
parent 131caba074
commit 20b39b27d9
10 changed files with 17 additions and 18 deletions

View File

@ -2675,7 +2675,7 @@ PyCurses_KeyName(PyObject *self, PyObject *args)
} }
knp = keyname(ch); knp = keyname(ch);
return PyBytes_FromString((knp == NULL) ? "" : (char *)knp); return PyBytes_FromString((knp == NULL) ? "" : knp);
} }
#endif #endif

View File

@ -5640,7 +5640,7 @@ PyInit__decimal(void)
goto error; /* GCOV_NOT_REACHED */ goto error; /* GCOV_NOT_REACHED */
} }
ASSIGN_PTR(cm->ex, PyErr_NewException((char *)cm->fqname, base, NULL)); ASSIGN_PTR(cm->ex, PyErr_NewException(cm->fqname, base, NULL));
Py_DECREF(base); Py_DECREF(base);
/* add to module */ /* add to module */
@ -5672,7 +5672,7 @@ PyInit__decimal(void)
goto error; /* GCOV_NOT_REACHED */ goto error; /* GCOV_NOT_REACHED */
} }
ASSIGN_PTR(cm->ex, PyErr_NewException((char *)cm->fqname, base, NULL)); ASSIGN_PTR(cm->ex, PyErr_NewException(cm->fqname, base, NULL));
Py_DECREF(base); Py_DECREF(base);
Py_INCREF(cm->ex); Py_INCREF(cm->ex);

View File

@ -362,7 +362,7 @@ importmap(const char *modname, const char *symbol,
if (mod == NULL) if (mod == NULL)
return -1; return -1;
o = PyObject_GetAttrString(mod, (char*)symbol); o = PyObject_GetAttrString(mod, symbol);
if (o == NULL) if (o == NULL)
goto errorexit; goto errorexit;
else if (!PyCapsule_IsValid(o, PyMultibyteCodec_CAPSULE_NAME)) { else if (!PyCapsule_IsValid(o, PyMultibyteCodec_CAPSULE_NAME)) {

View File

@ -1269,10 +1269,10 @@ mbstreamreader_iread(MultibyteStreamReaderObject *self,
if (sizehint < 0) if (sizehint < 0)
cres = PyObject_CallMethod(self->stream, cres = PyObject_CallMethod(self->stream,
(char *)method, NULL); method, NULL);
else else
cres = PyObject_CallMethod(self->stream, cres = PyObject_CallMethod(self->stream,
(char *)method, "i", sizehint); method, "i", sizehint);
if (cres == NULL) if (cres == NULL)
goto errorexit; goto errorexit;

View File

@ -1478,7 +1478,7 @@ PyUnknownEncodingHandler(void *encodingHandlerData,
static PyObject * static PyObject *
newxmlparseobject(char *encoding, char *namespace_separator, PyObject *intern) newxmlparseobject(const char *encoding, const char *namespace_separator, PyObject *intern)
{ {
int i; int i;
xmlparseobject *self; xmlparseobject *self;
@ -1932,8 +1932,7 @@ pyexpat_ParserCreate_impl(PyModuleDef *module, const char *encoding, const char
return NULL; return NULL;
} }
result = newxmlparseobject((char *)encoding, (char *)namespace_separator, result = newxmlparseobject(encoding, namespace_separator, intern);
intern);
if (intern_decref) { if (intern_decref) {
Py_DECREF(intern); Py_DECREF(intern);
} }
@ -2074,7 +2073,7 @@ MODULE_INITFUNC(void)
PyModule_AddObject(m, "XMLParserType", (PyObject *) &Xmlparsetype); PyModule_AddObject(m, "XMLParserType", (PyObject *) &Xmlparsetype);
PyModule_AddStringConstant(m, "EXPAT_VERSION", PyModule_AddStringConstant(m, "EXPAT_VERSION",
(char *) XML_ExpatVersion()); XML_ExpatVersion());
{ {
XML_Expat_Version info = XML_ExpatVersionInfo(); XML_Expat_Version info = XML_ExpatVersionInfo();
PyModule_AddObject(m, "version_info", PyModule_AddObject(m, "version_info",
@ -2154,7 +2153,7 @@ MODULE_INITFUNC(void)
#define MYCONST(name) \ #define MYCONST(name) \
if (PyModule_AddStringConstant(errors_module, #name, \ if (PyModule_AddStringConstant(errors_module, #name, \
(char *)XML_ErrorString(name)) < 0) \ XML_ErrorString(name)) < 0) \
return NULL; \ return NULL; \
tmpnum = PyLong_FromLong(name); \ tmpnum = PyLong_FromLong(name); \
if (tmpnum == NULL) return NULL; \ if (tmpnum == NULL) return NULL; \

View File

@ -3403,7 +3403,7 @@ _PyBytes_Resize(PyObject **pv, Py_ssize_t newsize)
_Py_DEC_REFTOTAL; _Py_DEC_REFTOTAL;
_Py_ForgetReference(v); _Py_ForgetReference(v);
*pv = (PyObject *) *pv = (PyObject *)
PyObject_REALLOC((char *)v, PyBytesObject_SIZE + newsize); PyObject_REALLOC(v, PyBytesObject_SIZE + newsize);
if (*pv == NULL) { if (*pv == NULL) {
PyObject_Del(v); PyObject_Del(v);
PyErr_NoMemory(); PyErr_NoMemory();

View File

@ -2026,7 +2026,7 @@ _PyFloat_Pack4(double x, unsigned char *p, int le)
} }
else { else {
float y = (float)x; float y = (float)x;
const char *s = (char*)&y; const unsigned char *s = (unsigned char*)&y;
int i, incr = 1; int i, incr = 1;
if (Py_IS_INFINITY(y) && !Py_IS_INFINITY(x)) if (Py_IS_INFINITY(y) && !Py_IS_INFINITY(x))
@ -2162,7 +2162,7 @@ _PyFloat_Pack8(double x, unsigned char *p, int le)
return -1; return -1;
} }
else { else {
const char *s = (char*)&x; const unsigned char *s = (unsigned char*)&x;
int i, incr = 1; int i, incr = 1;
if ((double_format == ieee_little_endian_format && !le) if ((double_format == ieee_little_endian_format && !le)

View File

@ -2312,7 +2312,7 @@ _PyLong_FromBytes(const char *s, Py_ssize_t len, int base)
PyObject *result, *strobj; PyObject *result, *strobj;
char *end = NULL; char *end = NULL;
result = PyLong_FromString((char*)s, &end, base); result = PyLong_FromString(s, &end, base);
if (end == NULL || (result != NULL && end == s + len)) if (end == NULL || (result != NULL && end == s + len))
return result; return result;
Py_XDECREF(result); Py_XDECREF(result);

View File

@ -727,7 +727,7 @@ resize_compact(PyObject *unicode, Py_ssize_t length)
_Py_DEC_REFTOTAL; _Py_DEC_REFTOTAL;
_Py_ForgetReference(unicode); _Py_ForgetReference(unicode);
new_unicode = (PyObject *)PyObject_REALLOC((char *)unicode, new_size); new_unicode = (PyObject *)PyObject_REALLOC(unicode, new_size);
if (new_unicode == NULL) { if (new_unicode == NULL) {
_Py_NewReference(unicode); _Py_NewReference(unicode);
PyErr_NoMemory(); PyErr_NoMemory();
@ -3483,7 +3483,7 @@ mbstowcs_errorpos(const char *str, size_t len)
memset(&mbs, 0, sizeof mbs); memset(&mbs, 0, sizeof mbs);
while (len) while (len)
{ {
converted = mbrtowc(&ch, (char*)str, len, &mbs); converted = mbrtowc(&ch, str, len, &mbs);
if (converted == 0) if (converted == 0)
/* Reached end of string */ /* Reached end of string */
break; break;

View File

@ -2064,7 +2064,7 @@ PyImport_AppendInittab(const char *name, PyObject* (*initfunc)(void))
memset(newtab, '\0', sizeof newtab); memset(newtab, '\0', sizeof newtab);
newtab[0].name = (char *)name; newtab[0].name = name;
newtab[0].initfunc = initfunc; newtab[0].initfunc = initfunc;
return PyImport_ExtendInittab(newtab); return PyImport_ExtendInittab(newtab);