Skip to content

Commit 2d06e84

Browse files
serhiy-storchakaserhiy-storchaka
committed
Issue #25923: Added the const qualifier to static constant arrays.
1 parent ea8c431 commit 2d06e84

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+139
-134
lines changed

‎Include/py_curses.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ static void **PyCurses_API;
103103
#endif
104104

105105
/* general error messages */
106-
static char *catchall_ERR = "curses function returned ERR";
107-
static char *catchall_NULL = "curses function returned NULL";
106+
static const char catchall_ERR[] = "curses function returned ERR";
107+
static const char catchall_NULL[] = "curses function returned NULL";
108108

109109
/* Function Prototype Macros - They are ugly but very, very useful. ;-)
110110

‎Include/pymath.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ PyAPI_FUNC(void) _Py_set_387controlword(unsigned short);
169169
#pragma float_control (pop)
170170
#define Py_NAN __icc_nan()
171171
#else /* ICC_NAN_RELAXED as default for Intel Compiler */
172-
static union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f};
172+
static const union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f};
173173
#define Py_NAN (__nan_store.__icc_nan)
174174
#endif /* ICC_NAN_STRICT */
175175
#endif /* __INTEL_COMPILER */

‎Modules/_csv.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ typedef enum {
6060

6161
typedef struct {
6262
QuoteStyle style;
63-
char *name;
63+
const char *name;
6464
} StyleDesc;
6565

66-
static StyleDesc quote_styles[] = {
66+
static const StyleDesc quote_styles[] = {
6767
{ QUOTE_MINIMAL, "QUOTE_MINIMAL" },
6868
{ QUOTE_ALL, "QUOTE_ALL" },
6969
{ QUOTE_NONNUMERIC, "QUOTE_NONNUMERIC" },
@@ -286,7 +286,7 @@ _set_str(const char *name, PyObject **target, PyObject *src, const char *dflt)
286286
static int
287287
dialect_check_quoting(int quoting)
288288
{
289-
StyleDesc *qs;
289+
const StyleDesc *qs;
290290

291291
for (qs = quote_styles; qs->name; qs++) {
292292
if ((int)qs->style == quoting)
@@ -1633,7 +1633,7 @@ PyMODINIT_FUNC
16331633
PyInit__csv(void)
16341634
{
16351635
PyObject *module;
1636-
StyleDesc *style;
1636+
const StyleDesc *style;
16371637

16381638
if (PyType_Ready(&Dialect_Type) < 0)
16391639
return NULL;

‎Modules/_ctypes/_ctypes.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ UnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
435435
return StructUnionType_new(type, args, kwds, 0);
436436
}
437437

438-
static char from_address_doc[] =
438+
static const char from_address_doc[] =
439439
"C.from_address(integer) -> C instance\naccess a C instance at the specified address";
440440

441441
static PyObject *
@@ -453,7 +453,7 @@ CDataType_from_address(PyObject *type, PyObject *value)
453453
return PyCData_AtAddress(type, buf);
454454
}
455455

456-
static char from_buffer_doc[] =
456+
static const char from_buffer_doc[] =
457457
"C.from_buffer(object, offset=0) -> C instance\ncreate a C instance from a writeable buffer";
458458

459459
static int
@@ -524,7 +524,7 @@ CDataType_from_buffer(PyObject *type, PyObject *args)
524524
return result;
525525
}
526526

527-
static char from_buffer_copy_doc[] =
527+
static const char from_buffer_copy_doc[] =
528528
"C.from_buffer_copy(object, offset=0) -> C instance\ncreate a C instance from a readable buffer";
529529

530530
static PyObject *
@@ -566,7 +566,7 @@ CDataType_from_buffer_copy(PyObject *type, PyObject *args)
566566
return result;
567567
}
568568

569-
static char in_dll_doc[] =
569+
static const char in_dll_doc[] =
570570
"C.in_dll(dll, name) -> C instance\naccess a C instance in a dll";
571571

572572
static PyObject *
@@ -623,7 +623,7 @@ CDataType_in_dll(PyObject *type, PyObject *args)
623623
return PyCData_AtAddress(type, address);
624624
}
625625

626-
static char from_param_doc[] =
626+
static const char from_param_doc[] =
627627
"Convert a Python object into a function call parameter.";
628628

629629
static PyObject *
@@ -1481,7 +1481,7 @@ _type_ attribute.
14811481
14821482
*/
14831483

1484-
static char *SIMPLE_TYPE_CHARS = "cbBhHiIlLdfuzZqQPXOv?g";
1484+
static const char SIMPLE_TYPE_CHARS[] = "cbBhHiIlLdfuzZqQPXOv?g";
14851485

14861486
static PyObject *
14871487
c_wchar_p_from_param(PyObject *type, PyObject *value)
@@ -5118,7 +5118,7 @@ static const char module_docs[] =
51185118

51195119
#ifdef MS_WIN32
51205120

5121-
static char comerror_doc[] = "Raised when a COM method call failed.";
5121+
static const char comerror_doc[] = "Raised when a COM method call failed.";
51225122

51235123
int
51245124
comerror_init(PyObject *self, PyObject *args, PyObject *kwds)

‎Modules/_ctypes/callproc.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ _parse_voidp(PyObject *obj, void **address)
12011201

12021202
#ifdef MS_WIN32
12031203

1204-
static char format_error_doc[] =
1204+
static const char format_error_doc[] =
12051205
"FormatError([integer]) -> string\n\
12061206
\n\
12071207
Convert a win32 error code into a string. If the error code is not\n\
@@ -1225,7 +1225,7 @@ static PyObject *format_error(PyObject *self, PyObject *args)
12251225
return result;
12261226
}
12271227

1228-
static char load_library_doc[] =
1228+
static const char load_library_doc[] =
12291229
"LoadLibrary(name) -> handle\n\
12301230
\n\
12311231
Load an executable (usually a DLL), and return a handle to it.\n\
@@ -1254,7 +1254,7 @@ static PyObject *load_library(PyObject *self, PyObject *args)
12541254
#endif
12551255
}
12561256

1257-
static char free_library_doc[] =
1257+
static const char free_library_doc[] =
12581258
"FreeLibrary(handle) -> void\n\
12591259
\n\
12601260
Free the handle of an executable previously loaded by LoadLibrary.\n";
@@ -1269,7 +1269,7 @@ static PyObject *free_library(PyObject *self, PyObject *args)
12691269
return Py_None;
12701270
}
12711271

1272-
static char copy_com_pointer_doc[] =
1272+
static const char copy_com_pointer_doc[] =
12731273
"CopyComPointer(src, dst) -> HRESULT value\n";
12741274

12751275
static PyObject *
@@ -1439,7 +1439,7 @@ call_cdeclfunction(PyObject *self, PyObject *args)
14391439
/*****************************************************************
14401440
* functions
14411441
*/
1442-
static char sizeof_doc[] =
1442+
static const char sizeof_doc[] =
14431443
"sizeof(C type) -> integer\n"
14441444
"sizeof(C instance) -> integer\n"
14451445
"Return the size in bytes of a C instance";
@@ -1460,7 +1460,7 @@ sizeof_func(PyObject *self, PyObject *obj)
14601460
return NULL;
14611461
}
14621462

1463-
static char alignment_doc[] =
1463+
static const char alignment_doc[] =
14641464
"alignment(C type) -> integer\n"
14651465
"alignment(C instance) -> integer\n"
14661466
"Return the alignment requirements of a C instance";
@@ -1483,7 +1483,7 @@ align_func(PyObject *self, PyObject *obj)
14831483
return NULL;
14841484
}
14851485

1486-
static char byref_doc[] =
1486+
static const char byref_doc[] =
14871487
"byref(C instance[, offset=0]) -> byref-object\n"
14881488
"Return a pointer lookalike to a C instance, only usable\n"
14891489
"as function argument";
@@ -1527,7 +1527,7 @@ byref(PyObject *self, PyObject *args)
15271527
return (PyObject *)parg;
15281528
}
15291529

1530-
static char addressof_doc[] =
1530+
static const char addressof_doc[] =
15311531
"addressof(C instance) -> integer\n"
15321532
"Return the address of the C instance internal buffer";
15331533

‎Modules/_curses_panel.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/* Release Number */
88

9-
static char *PyCursesVersion = "2.1";
9+
static const char PyCursesVersion[] = "2.1";
1010

1111
/* Includes */
1212

‎Modules/_datetimemodule.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,12 @@ divide_nearest(PyObject *m, PyObject *n)
184184
* and the number of days before that month in the same year. These
185185
* are correct for non-leap years only.
186186
*/
187-
static int _days_in_month[] = {
187+
static const int _days_in_month[] = {
188188
0, /* unused; this vector uses 1-based indexing */
189189
31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
190190
};
191191

192-
static int _days_before_month[] = {
192+
static const int _days_before_month[] = {
193193
0, /* unused; this vector uses 1-based indexing */
194194
0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
195195
};
@@ -1009,10 +1009,10 @@ append_keyword_tzinfo(PyObject *repr, PyObject *tzinfo)
10091009
static PyObject *
10101010
format_ctime(PyDateTime_Date *date, int hours, int minutes, int seconds)
10111011
{
1012-
static const char *DayNames[] = {
1012+
static const char * const DayNames[] = {
10131013
"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"
10141014
};
1015-
static const char *MonthNames[] = {
1015+
static const char * const MonthNames[] = {
10161016
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
10171017
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
10181018
};
@@ -2307,7 +2307,7 @@ static PyMethodDef delta_methods[] = {
23072307
{NULL, NULL},
23082308
};
23092309

2310-
static char delta_doc[] =
2310+
static const char delta_doc[] =
23112311
PyDoc_STR("Difference between two datetime values.");
23122312

23132313
static PyNumberMethods delta_as_number = {
@@ -2886,7 +2886,7 @@ static PyMethodDef date_methods[] = {
28862886
{NULL, NULL}
28872887
};
28882888

2889-
static char date_doc[] =
2889+
static const char date_doc[] =
28902890
PyDoc_STR("date(year, month, day) --> date object");
28912891

28922892
static PyNumberMethods date_as_number = {
@@ -3155,7 +3155,7 @@ static PyMethodDef tzinfo_methods[] = {
31553155
{NULL, NULL}
31563156
};
31573157

3158-
static char tzinfo_doc[] =
3158+
static const char tzinfo_doc[] =
31593159
PyDoc_STR("Abstract base class for time zone info objects.");
31603160

31613161
static PyTypeObject PyDateTime_TZInfoType = {
@@ -3387,7 +3387,7 @@ static PyMethodDef timezone_methods[] = {
33873387
{NULL, NULL}
33883388
};
33893389

3390-
static char timezone_doc[] =
3390+
static const char timezone_doc[] =
33913391
PyDoc_STR("Fixed offset from UTC implementation of tzinfo.");
33923392

33933393
static PyTypeObject PyDateTime_TimeZoneType = {
@@ -3877,7 +3877,7 @@ static PyMethodDef time_methods[] = {
38773877
{NULL, NULL}
38783878
};
38793879

3880-
static char time_doc[] =
3880+
static const char time_doc[] =
38813881
PyDoc_STR("time([hour[, minute[, second[, microsecond[, tzinfo]]]]]) --> a time object\n\
38823882
\n\
38833883
All arguments are optional. tzinfo may be None, or an instance of\n\
@@ -5065,7 +5065,7 @@ static PyMethodDef datetime_methods[] = {
50655065
{NULL, NULL}
50665066
};
50675067

5068-
static char datetime_doc[] =
5068+
static const char datetime_doc[] =
50695069
PyDoc_STR("datetime(year, month, day[, hour[, minute[, second[, microsecond[,tzinfo]]]]])\n\
50705070
\n\
50715071
The year, month and day arguments are required. tzinfo may be None, or an\n\

‎Modules/_dbmmodule.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
*/
1515
#if defined(HAVE_NDBM_H)
1616
#include <ndbm.h>
17-
static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
17+
static const char which_dbm[] = "GNU gdbm"; /* EMX port of GDBM */
1818
#elif defined(HAVE_GDBM_NDBM_H)
1919
#include <gdbm/ndbm.h>
20-
static char *which_dbm = "GNU gdbm";
20+
static const char which_dbm[] = "GNU gdbm";
2121
#elif defined(HAVE_GDBM_DASH_NDBM_H)
2222
#include <gdbm-ndbm.h>
23-
static char *which_dbm = "GNU gdbm";
23+
static const char which_dbm[] = "GNU gdbm";
2424
#elif defined(HAVE_BERKDB_H)
2525
#include <db.h>
26-
static char *which_dbm = "Berkeley DB";
26+
static const char which_dbm[] = "Berkeley DB";
2727
#else
2828
#error "No ndbm.h available!"
2929
#endif

‎Modules/_gdbmmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ dbmopen_impl(PyModuleDef *module, const char *name, const char *flags,
615615
return newdbmobject(name, iflags, mode);
616616
}
617617

618-
static char dbmmodule_open_flags[] = "rwcn"
618+
static const char dbmmodule_open_flags[] = "rwcn"
619619
#ifdef GDBM_FAST
620620
"f"
621621
#endif

‎Modules/_io/textio.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ typedef struct {
772772
encodefunc_t encodefunc;
773773
} encodefuncentry;
774774

775-
static encodefuncentry encodefuncs[] = {
775+
static const encodefuncentry encodefuncs[] = {
776776
{"ascii", (encodefunc_t) ascii_encode},
777777
{"iso8859-1", (encodefunc_t) latin1_encode},
778778
{"utf-8", (encodefunc_t) utf8_encode},
@@ -1022,7 +1022,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
10221022
goto error;
10231023
}
10241024
else if (PyUnicode_Check(res)) {
1025-
encodefuncentry *e = encodefuncs;
1025+
const encodefuncentry *e = encodefuncs;
10261026
while (e->name != NULL) {
10271027
if (!PyUnicode_CompareWithASCIIString(res, e->name)) {
10281028
self->encodefunc = e->encodefunc;

0 commit comments

Comments
 (0)