mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-06 15:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

closes bpo-39605: Fix some casts to not cast away const. (GH-18453)

Browse source 
gcc -Wcast-qual turns up a number of instances of casting away constness of pointers. Some of these can be safely modified, by either:

Adding the const to the type cast, as in:

-    return _PyUnicode_FromUCS1((unsigned char*)s, size);
+    return _PyUnicode_FromUCS1((const unsigned char*)s, size);

or, Removing the cast entirely, because it's not necessary (but probably was at one time), as in:

-    PyDTrace_FUNCTION_ENTRY((char *)filename, (char *)funcname, lineno);
+    PyDTrace_FUNCTION_ENTRY(filename, funcname, lineno);

These changes will not change code, but they will make it much easier to check for errors in consts
This commit is contained in:
Andy Lester 2020-02-11 20:28:35 -06:00 • committed by GitHub
parent 029e8401b7
commit e6be9b59a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Objects/bytes_methods.c
View file

@ -12,7 +12,7 @@ PyObject*
_Py_bytes_isspace(const char *cptr, Py_ssize_t len)
{
const unsigned char *p
= (unsigned char *) cptr;
= (const unsigned char *) cptr;
const unsigned char *e;
/* Shortcut for single character strings */
@ -42,7 +42,7 @@ PyObject*
_Py_bytes_isalpha(const char *cptr, Py_ssize_t len)
{
const unsigned char *p
= (unsigned char *) cptr;
= (const unsigned char *) cptr;
const unsigned char *e;
/* Shortcut for single character strings */
@ -72,7 +72,7 @@ PyObject*
_Py_bytes_isalnum(const char *cptr, Py_ssize_t len)
{
const unsigned char *p
= (unsigned char *) cptr;
= (const unsigned char *) cptr;
const unsigned char *e;
/* Shortcut for single character strings */
@ -123,7 +123,7 @@ _Py_bytes_isascii(const char *cptr, Py_ssize_t len)
/* Help allocation */
const char *_p = p;
while (_p < aligned_end) {
unsigned long value = *(unsigned long *) _p;
unsigned long value = *(const unsigned long *) _p;
if (value & ASCII_CHAR_MASK) {
Py_RETURN_FALSE;
}
@ -154,7 +154,7 @@ PyObject*
_Py_bytes_isdigit(const char *cptr, Py_ssize_t len)
{
const unsigned char *p
= (unsigned char *) cptr;
= (const unsigned char *) cptr;
const unsigned char *e;
/* Shortcut for single character strings */
@ -184,7 +184,7 @@ PyObject*
_Py_bytes_islower(const char *cptr, Py_ssize_t len)
{
const unsigned char *p
= (unsigned char *) cptr;
= (const unsigned char *) cptr;
const unsigned char *e;
int cased;
@ -218,7 +218,7 @@ PyObject*
_Py_bytes_isupper(const char *cptr, Py_ssize_t len)
{
const unsigned char *p
= (unsigned char *) cptr;
= (const unsigned char *) cptr;
const unsigned char *e;
int cased;
@ -254,7 +254,7 @@ PyObject*
_Py_bytes_istitle(const char *cptr, Py_ssize_t len)
{
const unsigned char *p
= (unsigned char *) cptr;
= (const unsigned char *) cptr;
const unsigned char *e;
int cased, previous_is_cased;