Skip to content

Commit 02cbf4a

Browse files
loewisloewis
committed
More unconsting.
1 parent f4e6928 commit 02cbf4a

File tree

9 files changed

+56
-62
lines changed

9 files changed

+56
-62
lines changed

‎Modules/_bisectmodule.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ bisect_right(PyObject *self, PyObject *args, PyObject *kw)
4040
int lo = 0;
4141
int hi = -1;
4242
int index;
43-
static const char *keywords[] = {"a", "x", "lo", "hi", NULL};
43+
static char *keywords[] = {"a", "x", "lo", "hi", NULL};
4444

4545
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|ii:bisect_right",
4646
keywords, &list, &item, &lo, &hi))
@@ -70,7 +70,7 @@ insort_right(PyObject *self, PyObject *args, PyObject *kw)
7070
int lo = 0;
7171
int hi = -1;
7272
int index;
73-
static const char *keywords[] = {"a", "x", "lo", "hi", NULL};
73+
static char *keywords[] = {"a", "x", "lo", "hi", NULL};
7474

7575
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|ii:insort_right",
7676
keywords, &list, &item, &lo, &hi))
@@ -137,7 +137,7 @@ bisect_left(PyObject *self, PyObject *args, PyObject *kw)
137137
int lo = 0;
138138
int hi = -1;
139139
int index;
140-
static const char *keywords[] = {"a", "x", "lo", "hi", NULL};
140+
static char *keywords[] = {"a", "x", "lo", "hi", NULL};
141141

142142
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|ii:bisect_left",
143143
keywords, &list, &item, &lo, &hi))
@@ -167,7 +167,7 @@ insort_left(PyObject *self, PyObject *args, PyObject *kw)
167167
int lo = 0;
168168
int hi = -1;
169169
int index;
170-
static const char *keywords[] = {"a", "x", "lo", "hi", NULL};
170+
static char *keywords[] = {"a", "x", "lo", "hi", NULL};
171171

172172
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|ii:insort_left",
173173
keywords, &list, &item, &lo, &hi))

‎Modules/_bsddb.c‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ static PyObject* _DBCursor_get(DBCursorObject* self, int extra_flags,
651651
int dlen = -1;
652652
int doff = -1;
653653
int flags = 0;
654-
static const char* kwnames[] = { "flags", "dlen", "doff", NULL };
654+
static char* kwnames[] = { "flags", "dlen", "doff", NULL };
655655

656656
if (!PyArg_ParseTupleAndKeywords(args, kwargs, format, kwnames,
657657
&flags, &dlen, &doff))
@@ -1150,10 +1150,10 @@ DB_associate(DBObject* self, PyObject* args, PyObject* kwargs)
11501150
#if (DBVER >= 41)
11511151
PyObject *txnobj = NULL;
11521152
DB_TXN *txn = NULL;
1153-
static const char* kwnames[] = {"secondaryDB", "callback", "flags", "txn",
1153+
static char* kwnames[] = {"secondaryDB", "callback", "flags", "txn",
11541154
NULL};
11551155
#else
1156-
static const char* kwnames[] = {"secondaryDB", "callback", "flags", NULL};
1156+
static char* kwnames[] = {"secondaryDB", "callback", "flags", NULL};
11571157
#endif
11581158

11591159
#if (DBVER >= 41)
@@ -1259,7 +1259,7 @@ _DB_consume(DBObject* self, PyObject* args, PyObject* kwargs, int consume_flag)
12591259
PyObject* retval = NULL;
12601260
DBT key, data;
12611261
DB_TXN *txn = NULL;
1262-
static const char* kwnames[] = { "txn", "flags", NULL };
1262+
static char* kwnames[] = { "txn", "flags", NULL };
12631263

12641264
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:consume", kwnames,
12651265
&txnobj, &flags))
@@ -1329,7 +1329,7 @@ DB_cursor(DBObject* self, PyObject* args, PyObject* kwargs)
13291329
DBC* dbc;
13301330
PyObject* txnobj = NULL;
13311331
DB_TXN *txn = NULL;
1332-
static const char* kwnames[] = { "txn", "flags", NULL };
1332+
static char* kwnames[] = { "txn", "flags", NULL };
13331333

13341334
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:cursor", kwnames,
13351335
&txnobj, &flags))
@@ -1354,7 +1354,7 @@ DB_delete(DBObject* self, PyObject* args, PyObject* kwargs)
13541354
PyObject* keyobj;
13551355
DBT key;
13561356
DB_TXN *txn = NULL;
1357-
static const char* kwnames[] = { "key", "txn", "flags", NULL };
1357+
static char* kwnames[] = { "key", "txn", "flags", NULL };
13581358

13591359
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:delete", kwnames,
13601360
&keyobj, &txnobj, &flags))
@@ -1406,7 +1406,7 @@ DB_get(DBObject* self, PyObject* args, PyObject* kwargs)
14061406
int doff = -1;
14071407
DBT key, data;
14081408
DB_TXN *txn = NULL;
1409-
static const char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
1409+
static char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
14101410
"doff", NULL};
14111411

14121412
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OOiii:get", kwnames,
@@ -1474,7 +1474,7 @@ DB_pget(DBObject* self, PyObject* args, PyObject* kwargs)
14741474
int doff = -1;
14751475
DBT key, pkey, data;
14761476
DB_TXN *txn = NULL;
1477-
static const char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
1477+
static char* kwnames[] = {"key", "default", "txn", "flags", "dlen",
14781478
"doff", NULL};
14791479

14801480
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|OOiii:pget", kwnames,
@@ -1572,7 +1572,7 @@ DB_get_size(DBObject* self, PyObject* args, PyObject* kwargs)
15721572
PyObject* retval = NULL;
15731573
DBT key, data;
15741574
DB_TXN *txn = NULL;
1575-
static const char* kwnames[] = { "key", "txn", NULL };
1575+
static char* kwnames[] = { "key", "txn", NULL };
15761576

15771577
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O:get_size", kwnames,
15781578
&keyobj, &txnobj))
@@ -1615,7 +1615,7 @@ DB_get_both(DBObject* self, PyObject* args, PyObject* kwargs)
16151615
PyObject* retval = NULL;
16161616
DBT key, data;
16171617
DB_TXN *txn = NULL;
1618-
static const char* kwnames[] = { "key", "data", "txn", "flags", NULL };
1618+
static char* kwnames[] = { "key", "data", "txn", "flags", NULL };
16191619

16201620

16211621
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|Oi:get_both", kwnames,
@@ -1766,7 +1766,7 @@ DB_key_range(DBObject* self, PyObject* args, PyObject* kwargs)
17661766
DBT key;
17671767
DB_TXN *txn = NULL;
17681768
DB_KEY_RANGE range;
1769-
static const char* kwnames[] = { "key", "txn", "flags", NULL };
1769+
static char* kwnames[] = { "key", "txn", "flags", NULL };
17701770

17711771
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|Oi:key_range", kwnames,
17721772
&keyobj, &txnobj, &flags))
@@ -1797,17 +1797,17 @@ DB_open(DBObject* self, PyObject* args, PyObject* kwargs)
17971797
PyObject *txnobj = NULL;
17981798
DB_TXN *txn = NULL;
17991799
/* with dbname */
1800-
static const char* kwnames[] = {
1800+
static char* kwnames[] = {
18011801
"filename", "dbname", "dbtype", "flags", "mode", "txn", NULL};
18021802
/* without dbname */
18031803
static const char* kwnames_basic[] = {
18041804
"filename", "dbtype", "flags", "mode", "txn", NULL};
18051805
#else
18061806
/* with dbname */
1807-
static const char* kwnames[] = {
1807+
static char* kwnames[] = {
18081808
"filename", "dbname", "dbtype", "flags", "mode", NULL};
18091809
/* without dbname */
1810-
static const char* kwnames_basic[] = {
1810+
static char* kwnames_basic[] = {
18111811
"filename", "dbtype", "flags", "mode", NULL};
18121812
#endif
18131813

@@ -1891,7 +1891,7 @@ DB_put(DBObject* self, PyObject* args, PyObject* kwargs)
18911891
PyObject* keyobj, *dataobj, *retval;
18921892
DBT key, data;
18931893
DB_TXN *txn = NULL;
1894-
static const char* kwnames[] = { "key", "data", "txn", "flags", "dlen",
1894+
static char* kwnames[] = { "key", "data", "txn", "flags", "dlen",
18951895
"doff", NULL };
18961896

18971897
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|Oiii:put", kwnames,
@@ -1932,7 +1932,7 @@ DB_remove(DBObject* self, PyObject* args, PyObject* kwargs)
19321932
char* filename;
19331933
char* database = NULL;
19341934
int err, flags=0;
1935-
static const char* kwnames[] = { "filename", "dbname", "flags", NULL};
1935+
static char* kwnames[] = { "filename", "dbname", "flags", NULL};
19361936

19371937
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|zi:remove", kwnames,
19381938
&filename, &database, &flags))
@@ -2350,9 +2350,9 @@ DB_stat(DBObject* self, PyObject* args, PyObject* kwargs)
23502350
#if (DBVER >= 43)
23512351
PyObject* txnobj = NULL;
23522352
DB_TXN *txn = NULL;
2353-
static const char* kwnames[] = { "txn", "flags", NULL };
2353+
static char* kwnames[] = { "txn", "flags", NULL };
23542354
#else
2355-
static const char* kwnames[] = { "flags", NULL };
2355+
static char* kwnames[] = { "flags", NULL };
23562356
#endif
23572357

23582358
#if (DBVER >= 43)
@@ -2492,7 +2492,7 @@ DB_truncate(DBObject* self, PyObject* args, PyObject* kwargs)
24922492
u_int32_t count=0;
24932493
PyObject* txnobj = NULL;
24942494
DB_TXN *txn = NULL;
2495-
static const char* kwnames[] = { "txn", "flags", NULL };
2495+
static char* kwnames[] = { "txn", "flags", NULL };
24962496

24972497
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:cursor", kwnames,
24982498
&txnobj, &flags))
@@ -2536,7 +2536,7 @@ DB_verify(DBObject* self, PyObject* args, PyObject* kwargs)
25362536
char* dbName=NULL;
25372537
char* outFileName=NULL;
25382538
FILE* outFile=NULL;
2539-
static const char* kwnames[] = { "filename", "dbname", "outfile", "flags",
2539+
static char* kwnames[] = { "filename", "dbname", "outfile", "flags",
25402540
NULL };
25412541

25422542
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|zzi:verify", kwnames,
@@ -2594,7 +2594,7 @@ DB_set_encrypt(DBObject* self, PyObject* args, PyObject* kwargs)
25942594
int err;
25952595
u_int32_t flags=0;
25962596
char *passwd = NULL;
2597-
static const char* kwnames[] = { "passwd", "flags", NULL };
2597+
static char* kwnames[] = { "passwd", "flags", NULL };
25982598

25992599
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i:set_encrypt", kwnames,
26002600
&passwd, &flags)) {
@@ -3034,7 +3034,7 @@ DBC_get(DBCursorObject* self, PyObject* args, PyObject *kwargs)
30343034
int dlen = -1;
30353035
int doff = -1;
30363036
DBT key, data;
3037-
static const char* kwnames[] = { "key","data", "flags", "dlen", "doff",
3037+
static char* kwnames[] = { "key","data", "flags", "dlen", "doff",
30383038
NULL };
30393039

30403040
CLEAR_DBT(key);
@@ -3121,7 +3121,7 @@ DBC_pget(DBCursorObject* self, PyObject* args, PyObject *kwargs)
31213121
int dlen = -1;
31223122
int doff = -1;
31233123
DBT key, pkey, data;
3124-
static const char* kwnames[] = { "key","data", "flags", "dlen", "doff",
3124+
static char* kwnames[] = { "key","data", "flags", "dlen", "doff",
31253125
NULL };
31263126

31273127
CLEAR_DBT(key);
@@ -3283,7 +3283,7 @@ DBC_put(DBCursorObject* self, PyObject* args, PyObject* kwargs)
32833283
int err, flags = 0;
32843284
PyObject* keyobj, *dataobj;
32853285
DBT key, data;
3286-
static const char* kwnames[] = { "key", "data", "flags", "dlen", "doff",
3286+
static char* kwnames[] = { "key", "data", "flags", "dlen", "doff",
32873287
NULL };
32883288
int dlen = -1;
32893289
int doff = -1;
@@ -3319,7 +3319,7 @@ DBC_set(DBCursorObject* self, PyObject* args, PyObject *kwargs)
33193319
int err, flags = 0;
33203320
DBT key, data;
33213321
PyObject* retval, *keyobj;
3322-
static const char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
3322+
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
33233323
int dlen = -1;
33243324
int doff = -1;
33253325

@@ -3389,7 +3389,7 @@ DBC_set_range(DBCursorObject* self, PyObject* args, PyObject* kwargs)
33893389
int err, flags = 0;
33903390
DBT key, data;
33913391
PyObject* retval, *keyobj;
3392-
static const char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
3392+
static char* kwnames[] = { "key", "flags", "dlen", "doff", NULL };
33933393
int dlen = -1;
33943394
int doff = -1;
33953395

@@ -3579,7 +3579,7 @@ DBC_set_recno(DBCursorObject* self, PyObject* args, PyObject *kwargs)
35793579
PyObject* retval;
35803580
int dlen = -1;
35813581
int doff = -1;
3582-
static const char* kwnames[] = { "recno","flags", "dlen", "doff", NULL };
3582+
static char* kwnames[] = { "recno","flags", "dlen", "doff", NULL };
35833583

35843584
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|iii:set_recno", kwnames,
35853585
&irecno, &flags, &dlen, &doff))
@@ -3773,7 +3773,7 @@ DBEnv_dbremove(DBEnvObject* self, PyObject* args, PyObject* kwargs)
37733773
char *database = NULL;
37743774
PyObject *txnobj = NULL;
37753775
DB_TXN *txn = NULL;
3776-
static const char* kwnames[] = { "file", "database", "txn", "flags",
3776+
static char* kwnames[] = { "file", "database", "txn", "flags",
37773777
NULL };
37783778

37793779
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss|Oi:dbremove", kwnames,
@@ -3801,7 +3801,7 @@ DBEnv_dbrename(DBEnvObject* self, PyObject* args, PyObject* kwargs)
38013801
char *newname = NULL;
38023802
PyObject *txnobj = NULL;
38033803
DB_TXN *txn = NULL;
3804-
static const char* kwnames[] = { "file", "database", "newname", "txn",
3804+
static char* kwnames[] = { "file", "database", "newname", "txn",
38053805
"flags", NULL };
38063806

38073807
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sss|Oi:dbrename", kwnames,
@@ -3826,7 +3826,7 @@ DBEnv_set_encrypt(DBEnvObject* self, PyObject* args, PyObject* kwargs)
38263826
int err;
38273827
u_int32_t flags=0;
38283828
char *passwd = NULL;
3829-
static const char* kwnames[] = { "passwd", "flags", NULL };
3829+
static char* kwnames[] = { "passwd", "flags", NULL };
38303830

38313831
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i:set_encrypt", kwnames,
38323832
&passwd, &flags)) {
@@ -3849,7 +3849,7 @@ DBEnv_set_timeout(DBEnvObject* self, PyObject* args, PyObject* kwargs)
38493849
int err;
38503850
u_int32_t flags=0;
38513851
u_int32_t timeout = 0;
3852-
static const char* kwnames[] = { "timeout", "flags", NULL };
3852+
static char* kwnames[] = { "timeout", "flags", NULL };
38533853

38543854
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:set_timeout", kwnames,
38553855
&timeout, &flags)) {
@@ -4136,7 +4136,7 @@ DBEnv_txn_begin(DBEnvObject* self, PyObject* args, PyObject* kwargs)
41364136
int flags = 0;
41374137
PyObject* txnobj = NULL;
41384138
DB_TXN *txn = NULL;
4139-
static const char* kwnames[] = { "parent", "flags", NULL };
4139+
static char* kwnames[] = { "parent", "flags", NULL };
41404140

41414141
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:txn_begin", kwnames,
41424142
&txnobj, &flags))
@@ -4986,7 +4986,7 @@ DB_construct(PyObject* self, PyObject* args, PyObject* kwargs)
49864986
{
49874987
PyObject* dbenvobj = NULL;
49884988
int flags = 0;
4989-
static const char* kwnames[] = { "dbEnv", "flags", NULL};
4989+
static char* kwnames[] = { "dbEnv", "flags", NULL};
49904990

49914991
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oi:DB", kwnames,
49924992
&dbenvobj, &flags))

‎Modules/_csv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ Dialect_dealloc(DialectObj *self)
291291
self->ob_type->tp_free((PyObject *)self);
292292
}
293293

294-
static const char *dialect_kws[] = {
294+
static char *dialect_kws[] = {
295295
"dialect",
296296
"delimiter",
297297
"doublequote",

‎Modules/_elementtree.c‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,6 @@ typedef int Py_ssize_t;
106106
#endif
107107
#endif
108108

109-
#if (PY_VERSION_HEX >= 0x02050000)
110-
#define PY_CONST const /* 2.5 adds const to some API:s */
111-
#else
112-
#define PY_CONST
113-
#endif
114-
115109
#if !defined(Py_RETURN_NONE)
116110
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
117111
#endif
@@ -2192,7 +2186,7 @@ xmlparser(PyObject* _self, PyObject* args, PyObject* kw)
21922186

21932187
PyObject* target = NULL;
21942188
char* encoding = NULL;
2195-
static PY_CONST char* kwlist[] = { "target", "encoding", NULL };
2189+
static char* kwlist[] = { "target", "encoding", NULL };
21962190
if (!PyArg_ParseTupleAndKeywords(args, kw, "|Oz:XMLParser", kwlist,
21972191
&target, &encoding))
21982192
return NULL;

‎Modules/cjkcodecs/multibytecodec.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ PyDoc_STRVAR(MultibyteCodec_StreamReader__doc__,
4545
PyDoc_STRVAR(MultibyteCodec_StreamWriter__doc__,
4646
"I.StreamWriter(stream[, errors]) -> StreamWriter instance");
4747

48-
static const char *codeckwarglist[] = {"input", "errors", NULL};
49-
static const char *streamkwarglist[] = {"stream", "errors", NULL};
48+
static char *codeckwarglist[] = {"input", "errors", NULL};
49+
static char *streamkwarglist[] = {"stream", "errors", NULL};
5050

5151
static PyObject *multibytecodec_encode(MultibyteCodec *,
5252
MultibyteCodec_State *, const Py_UNICODE **, size_t,

0 commit comments

Comments
 (0)