Skip to content

Commit 49cd69e

Browse files
serhiy-storchakaserhiy-storchaka
committed
Use (void(*)(void)) instead of (void *).
1 parent a686d9d commit 49cd69e

76 files changed

Lines changed: 643 additions & 643 deletions

Some content is hidden

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

‎Modules/_io/clinic/_iomodule.c.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ PyDoc_STRVAR(_io_open__doc__,
127127
"opened in a binary mode.");
128128

129129
#define _IO_OPEN_METHODDEF \
130-
{"open", (PyCFunction)(void *)_io_open, METH_FASTCALL|METH_KEYWORDS, _io_open__doc__},
130+
{"open", (PyCFunction)(void(*)(void))_io_open, METH_FASTCALL|METH_KEYWORDS, _io_open__doc__},
131131

132132
static PyObject *
133133
_io_open_impl(PyObject *module, PyObject *file, const char *mode,
@@ -158,4 +158,4 @@ _io_open(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw
158158
exit:
159159
return return_value;
160160
}
161-
/*[clinic end generated code: output=44696878bab3e9e6 input=a9049054013a1b77]*/
161+
/*[clinic end generated code: output=a2c1af38d943ccec input=a9049054013a1b77]*/

‎Modules/_io/clinic/bufferedio.c.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ PyDoc_STRVAR(_io__Buffered_peek__doc__,
9191
"\n");
9292

9393
#define _IO__BUFFERED_PEEK_METHODDEF \
94-
{"peek", (PyCFunction)(void *)_io__Buffered_peek, METH_FASTCALL, _io__Buffered_peek__doc__},
94+
{"peek", (PyCFunction)(void(*)(void))_io__Buffered_peek, METH_FASTCALL, _io__Buffered_peek__doc__},
9595

9696
static PyObject *
9797
_io__Buffered_peek_impl(buffered *self, Py_ssize_t size);
@@ -118,7 +118,7 @@ PyDoc_STRVAR(_io__Buffered_read__doc__,
118118
"\n");
119119

120120
#define _IO__BUFFERED_READ_METHODDEF \
121-
{"read", (PyCFunction)(void *)_io__Buffered_read, METH_FASTCALL, _io__Buffered_read__doc__},
121+
{"read", (PyCFunction)(void(*)(void))_io__Buffered_read, METH_FASTCALL, _io__Buffered_read__doc__},
122122

123123
static PyObject *
124124
_io__Buffered_read_impl(buffered *self, Py_ssize_t n);
@@ -145,7 +145,7 @@ PyDoc_STRVAR(_io__Buffered_read1__doc__,
145145
"\n");
146146

147147
#define _IO__BUFFERED_READ1_METHODDEF \
148-
{"read1", (PyCFunction)(void *)_io__Buffered_read1, METH_FASTCALL, _io__Buffered_read1__doc__},
148+
{"read1", (PyCFunction)(void(*)(void))_io__Buffered_read1, METH_FASTCALL, _io__Buffered_read1__doc__},
149149

150150
static PyObject *
151151
_io__Buffered_read1_impl(buffered *self, Py_ssize_t n);
@@ -234,7 +234,7 @@ PyDoc_STRVAR(_io__Buffered_readline__doc__,
234234
"\n");
235235

236236
#define _IO__BUFFERED_READLINE_METHODDEF \
237-
{"readline", (PyCFunction)(void *)_io__Buffered_readline, METH_FASTCALL, _io__Buffered_readline__doc__},
237+
{"readline", (PyCFunction)(void(*)(void))_io__Buffered_readline, METH_FASTCALL, _io__Buffered_readline__doc__},
238238

239239
static PyObject *
240240
_io__Buffered_readline_impl(buffered *self, Py_ssize_t size);
@@ -261,7 +261,7 @@ PyDoc_STRVAR(_io__Buffered_seek__doc__,
261261
"\n");
262262

263263
#define _IO__BUFFERED_SEEK_METHODDEF \
264-
{"seek", (PyCFunction)(void *)_io__Buffered_seek, METH_FASTCALL, _io__Buffered_seek__doc__},
264+
{"seek", (PyCFunction)(void(*)(void))_io__Buffered_seek, METH_FASTCALL, _io__Buffered_seek__doc__},
265265

266266
static PyObject *
267267
_io__Buffered_seek_impl(buffered *self, PyObject *targetobj, int whence);
@@ -289,7 +289,7 @@ PyDoc_STRVAR(_io__Buffered_truncate__doc__,
289289
"\n");
290290

291291
#define _IO__BUFFERED_TRUNCATE_METHODDEF \
292-
{"truncate", (PyCFunction)(void *)_io__Buffered_truncate, METH_FASTCALL, _io__Buffered_truncate__doc__},
292+
{"truncate", (PyCFunction)(void(*)(void))_io__Buffered_truncate, METH_FASTCALL, _io__Buffered_truncate__doc__},
293293

294294
static PyObject *
295295
_io__Buffered_truncate_impl(buffered *self, PyObject *pos);
@@ -476,4 +476,4 @@ _io_BufferedRandom___init__(PyObject *self, PyObject *args, PyObject *kwargs)
476476
exit:
477477
return return_value;
478478
}
479-
/*[clinic end generated code: output=45291eb55670b411 input=a9049054013a1b77]*/
479+
/*[clinic end generated code: output=cb4bf8d50533953b input=a9049054013a1b77]*/

‎Modules/_io/clinic/bytesio.c.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ PyDoc_STRVAR(_io_BytesIO_read__doc__,
158158
"Return an empty bytes object at EOF.");
159159

160160
#define _IO_BYTESIO_READ_METHODDEF \
161-
{"read", (PyCFunction)(void *)_io_BytesIO_read, METH_FASTCALL, _io_BytesIO_read__doc__},
161+
{"read", (PyCFunction)(void(*)(void))_io_BytesIO_read, METH_FASTCALL, _io_BytesIO_read__doc__},
162162

163163
static PyObject *
164164
_io_BytesIO_read_impl(bytesio *self, Py_ssize_t size);
@@ -189,7 +189,7 @@ PyDoc_STRVAR(_io_BytesIO_read1__doc__,
189189
"Return an empty bytes object at EOF.");
190190

191191
#define _IO_BYTESIO_READ1_METHODDEF \
192-
{"read1", (PyCFunction)(void *)_io_BytesIO_read1, METH_FASTCALL, _io_BytesIO_read1__doc__},
192+
{"read1", (PyCFunction)(void(*)(void))_io_BytesIO_read1, METH_FASTCALL, _io_BytesIO_read1__doc__},
193193

194194
static PyObject *
195195
_io_BytesIO_read1_impl(bytesio *self, Py_ssize_t size);
@@ -221,7 +221,7 @@ PyDoc_STRVAR(_io_BytesIO_readline__doc__,
221221
"Return an empty bytes object at EOF.");
222222

223223
#define _IO_BYTESIO_READLINE_METHODDEF \
224-
{"readline", (PyCFunction)(void *)_io_BytesIO_readline, METH_FASTCALL, _io_BytesIO_readline__doc__},
224+
{"readline", (PyCFunction)(void(*)(void))_io_BytesIO_readline, METH_FASTCALL, _io_BytesIO_readline__doc__},
225225

226226
static PyObject *
227227
_io_BytesIO_readline_impl(bytesio *self, Py_ssize_t size);
@@ -253,7 +253,7 @@ PyDoc_STRVAR(_io_BytesIO_readlines__doc__,
253253
"total number of bytes in the lines returned.");
254254

255255
#define _IO_BYTESIO_READLINES_METHODDEF \
256-
{"readlines", (PyCFunction)(void *)_io_BytesIO_readlines, METH_FASTCALL, _io_BytesIO_readlines__doc__},
256+
{"readlines", (PyCFunction)(void(*)(void))_io_BytesIO_readlines, METH_FASTCALL, _io_BytesIO_readlines__doc__},
257257

258258
static PyObject *
259259
_io_BytesIO_readlines_impl(bytesio *self, PyObject *arg);
@@ -320,7 +320,7 @@ PyDoc_STRVAR(_io_BytesIO_truncate__doc__,
320320
"The current file position is unchanged. Returns the new size.");
321321

322322
#define _IO_BYTESIO_TRUNCATE_METHODDEF \
323-
{"truncate", (PyCFunction)(void *)_io_BytesIO_truncate, METH_FASTCALL, _io_BytesIO_truncate__doc__},
323+
{"truncate", (PyCFunction)(void(*)(void))_io_BytesIO_truncate, METH_FASTCALL, _io_BytesIO_truncate__doc__},
324324

325325
static PyObject *
326326
_io_BytesIO_truncate_impl(bytesio *self, Py_ssize_t size);
@@ -354,7 +354,7 @@ PyDoc_STRVAR(_io_BytesIO_seek__doc__,
354354
"Returns the new absolute position.");
355355

356356
#define _IO_BYTESIO_SEEK_METHODDEF \
357-
{"seek", (PyCFunction)(void *)_io_BytesIO_seek, METH_FASTCALL, _io_BytesIO_seek__doc__},
357+
{"seek", (PyCFunction)(void(*)(void))_io_BytesIO_seek, METH_FASTCALL, _io_BytesIO_seek__doc__},
358358

359359
static PyObject *
360360
_io_BytesIO_seek_impl(bytesio *self, Py_ssize_t pos, int whence);
@@ -444,4 +444,4 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs)
444444
exit:
445445
return return_value;
446446
}
447-
/*[clinic end generated code: output=9f628dcc1d2f3867 input=a9049054013a1b77]*/
447+
/*[clinic end generated code: output=89538a941ae1267a input=a9049054013a1b77]*/

‎Modules/_io/clinic/fileio.c.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ PyDoc_STRVAR(_io_FileIO_read__doc__,
202202
"Return an empty bytes object at EOF.");
203203

204204
#define _IO_FILEIO_READ_METHODDEF \
205-
{"read", (PyCFunction)(void *)_io_FileIO_read, METH_FASTCALL, _io_FileIO_read__doc__},
205+
{"read", (PyCFunction)(void(*)(void))_io_FileIO_read, METH_FASTCALL, _io_FileIO_read__doc__},
206206

207207
static PyObject *
208208
_io_FileIO_read_impl(fileio *self, Py_ssize_t size);
@@ -274,7 +274,7 @@ PyDoc_STRVAR(_io_FileIO_seek__doc__,
274274
"Note that not all file objects are seekable.");
275275

276276
#define _IO_FILEIO_SEEK_METHODDEF \
277-
{"seek", (PyCFunction)(void *)_io_FileIO_seek, METH_FASTCALL, _io_FileIO_seek__doc__},
277+
{"seek", (PyCFunction)(void(*)(void))_io_FileIO_seek, METH_FASTCALL, _io_FileIO_seek__doc__},
278278

279279
static PyObject *
280280
_io_FileIO_seek_impl(fileio *self, PyObject *pos, int whence);
@@ -328,7 +328,7 @@ PyDoc_STRVAR(_io_FileIO_truncate__doc__,
328328
"The current file position is changed to the value of size.");
329329

330330
#define _IO_FILEIO_TRUNCATE_METHODDEF \
331-
{"truncate", (PyCFunction)(void *)_io_FileIO_truncate, METH_FASTCALL, _io_FileIO_truncate__doc__},
331+
{"truncate", (PyCFunction)(void(*)(void))_io_FileIO_truncate, METH_FASTCALL, _io_FileIO_truncate__doc__},
332332

333333
static PyObject *
334334
_io_FileIO_truncate_impl(fileio *self, PyObject *posobj);
@@ -373,4 +373,4 @@ _io_FileIO_isatty(fileio *self, PyObject *Py_UNUSED(ignored))
373373
#ifndef _IO_FILEIO_TRUNCATE_METHODDEF
374374
#define _IO_FILEIO_TRUNCATE_METHODDEF
375375
#endif /* !defined(_IO_FILEIO_TRUNCATE_METHODDEF) */
376-
/*[clinic end generated code: output=00539f885575aaae input=a9049054013a1b77]*/
376+
/*[clinic end generated code: output=9d44e7035bce105d input=a9049054013a1b77]*/

‎Modules/_io/clinic/iobase.c.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ PyDoc_STRVAR(_io__IOBase_readline__doc__,
174174
"terminator(s) recognized.");
175175

176176
#define _IO__IOBASE_READLINE_METHODDEF \
177-
{"readline", (PyCFunction)(void *)_io__IOBase_readline, METH_FASTCALL, _io__IOBase_readline__doc__},
177+
{"readline", (PyCFunction)(void(*)(void))_io__IOBase_readline, METH_FASTCALL, _io__IOBase_readline__doc__},
178178

179179
static PyObject *
180180
_io__IOBase_readline_impl(PyObject *self, Py_ssize_t limit);
@@ -206,7 +206,7 @@ PyDoc_STRVAR(_io__IOBase_readlines__doc__,
206206
"lines so far exceeds hint.");
207207

208208
#define _IO__IOBASE_READLINES_METHODDEF \
209-
{"readlines", (PyCFunction)(void *)_io__IOBase_readlines, METH_FASTCALL, _io__IOBase_readlines__doc__},
209+
{"readlines", (PyCFunction)(void(*)(void))_io__IOBase_readlines, METH_FASTCALL, _io__IOBase_readlines__doc__},
210210

211211
static PyObject *
212212
_io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint);
@@ -241,7 +241,7 @@ PyDoc_STRVAR(_io__RawIOBase_read__doc__,
241241
"\n");
242242

243243
#define _IO__RAWIOBASE_READ_METHODDEF \
244-
{"read", (PyCFunction)(void *)_io__RawIOBase_read, METH_FASTCALL, _io__RawIOBase_read__doc__},
244+
{"read", (PyCFunction)(void(*)(void))_io__RawIOBase_read, METH_FASTCALL, _io__RawIOBase_read__doc__},
245245

246246
static PyObject *
247247
_io__RawIOBase_read_impl(PyObject *self, Py_ssize_t n);
@@ -279,4 +279,4 @@ _io__RawIOBase_readall(PyObject *self, PyObject *Py_UNUSED(ignored))
279279
{
280280
return _io__RawIOBase_readall_impl(self);
281281
}
282-
/*[clinic end generated code: output=223535e45b4f6441 input=a9049054013a1b77]*/
282+
/*[clinic end generated code: output=cde4b0e96a4e69e3 input=a9049054013a1b77]*/

‎Modules/_io/clinic/stringio.c.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ PyDoc_STRVAR(_io_StringIO_read__doc__,
4848
"is reached. Return an empty string at EOF.");
4949

5050
#define _IO_STRINGIO_READ_METHODDEF \
51-
{"read", (PyCFunction)(void *)_io_StringIO_read, METH_FASTCALL, _io_StringIO_read__doc__},
51+
{"read", (PyCFunction)(void(*)(void))_io_StringIO_read, METH_FASTCALL, _io_StringIO_read__doc__},
5252

5353
static PyObject *
5454
_io_StringIO_read_impl(stringio *self, Py_ssize_t size);
@@ -78,7 +78,7 @@ PyDoc_STRVAR(_io_StringIO_readline__doc__,
7878
"Returns an empty string if EOF is hit immediately.");
7979

8080
#define _IO_STRINGIO_READLINE_METHODDEF \
81-
{"readline", (PyCFunction)(void *)_io_StringIO_readline, METH_FASTCALL, _io_StringIO_readline__doc__},
81+
{"readline", (PyCFunction)(void(*)(void))_io_StringIO_readline, METH_FASTCALL, _io_StringIO_readline__doc__},
8282

8383
static PyObject *
8484
_io_StringIO_readline_impl(stringio *self, Py_ssize_t size);
@@ -110,7 +110,7 @@ PyDoc_STRVAR(_io_StringIO_truncate__doc__,
110110
"Returns the new absolute position.");
111111

112112
#define _IO_STRINGIO_TRUNCATE_METHODDEF \
113-
{"truncate", (PyCFunction)(void *)_io_StringIO_truncate, METH_FASTCALL, _io_StringIO_truncate__doc__},
113+
{"truncate", (PyCFunction)(void(*)(void))_io_StringIO_truncate, METH_FASTCALL, _io_StringIO_truncate__doc__},
114114

115115
static PyObject *
116116
_io_StringIO_truncate_impl(stringio *self, Py_ssize_t size);
@@ -144,7 +144,7 @@ PyDoc_STRVAR(_io_StringIO_seek__doc__,
144144
"Returns the new absolute position.");
145145

146146
#define _IO_STRINGIO_SEEK_METHODDEF \
147-
{"seek", (PyCFunction)(void *)_io_StringIO_seek, METH_FASTCALL, _io_StringIO_seek__doc__},
147+
{"seek", (PyCFunction)(void(*)(void))_io_StringIO_seek, METH_FASTCALL, _io_StringIO_seek__doc__},
148148

149149
static PyObject *
150150
_io_StringIO_seek_impl(stringio *self, Py_ssize_t pos, int whence);
@@ -286,4 +286,4 @@ _io_StringIO_seekable(stringio *self, PyObject *Py_UNUSED(ignored))
286286
{
287287
return _io_StringIO_seekable_impl(self);
288288
}
289-
/*[clinic end generated code: output=fbefd36c019d8f6c input=a9049054013a1b77]*/
289+
/*[clinic end generated code: output=00c3c7a1c6ea6773 input=a9049054013a1b77]*/

‎Modules/_io/clinic/textio.c.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ PyDoc_STRVAR(_io_IncrementalNewlineDecoder_decode__doc__,
4646
"\n");
4747

4848
#define _IO_INCREMENTALNEWLINEDECODER_DECODE_METHODDEF \
49-
{"decode", (PyCFunction)(void *)_io_IncrementalNewlineDecoder_decode, METH_FASTCALL|METH_KEYWORDS, _io_IncrementalNewlineDecoder_decode__doc__},
49+
{"decode", (PyCFunction)(void(*)(void))_io_IncrementalNewlineDecoder_decode, METH_FASTCALL|METH_KEYWORDS, _io_IncrementalNewlineDecoder_decode__doc__},
5050

5151
static PyObject *
5252
_io_IncrementalNewlineDecoder_decode_impl(nldecoder_object *self,
@@ -186,7 +186,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_reconfigure__doc__,
186186
"This also does an implicit stream flush.");
187187

188188
#define _IO_TEXTIOWRAPPER_RECONFIGURE_METHODDEF \
189-
{"reconfigure", (PyCFunction)(void *)_io_TextIOWrapper_reconfigure, METH_FASTCALL|METH_KEYWORDS, _io_TextIOWrapper_reconfigure__doc__},
189+
{"reconfigure", (PyCFunction)(void(*)(void))_io_TextIOWrapper_reconfigure, METH_FASTCALL|METH_KEYWORDS, _io_TextIOWrapper_reconfigure__doc__},
190190

191191
static PyObject *
192192
_io_TextIOWrapper_reconfigure_impl(textio *self, PyObject *encoding,
@@ -265,7 +265,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_read__doc__,
265265
"\n");
266266

267267
#define _IO_TEXTIOWRAPPER_READ_METHODDEF \
268-
{"read", (PyCFunction)(void *)_io_TextIOWrapper_read, METH_FASTCALL, _io_TextIOWrapper_read__doc__},
268+
{"read", (PyCFunction)(void(*)(void))_io_TextIOWrapper_read, METH_FASTCALL, _io_TextIOWrapper_read__doc__},
269269

270270
static PyObject *
271271
_io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n);
@@ -292,7 +292,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_readline__doc__,
292292
"\n");
293293

294294
#define _IO_TEXTIOWRAPPER_READLINE_METHODDEF \
295-
{"readline", (PyCFunction)(void *)_io_TextIOWrapper_readline, METH_FASTCALL, _io_TextIOWrapper_readline__doc__},
295+
{"readline", (PyCFunction)(void(*)(void))_io_TextIOWrapper_readline, METH_FASTCALL, _io_TextIOWrapper_readline__doc__},
296296

297297
static PyObject *
298298
_io_TextIOWrapper_readline_impl(textio *self, Py_ssize_t size);
@@ -319,7 +319,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_seek__doc__,
319319
"\n");
320320

321321
#define _IO_TEXTIOWRAPPER_SEEK_METHODDEF \
322-
{"seek", (PyCFunction)(void *)_io_TextIOWrapper_seek, METH_FASTCALL, _io_TextIOWrapper_seek__doc__},
322+
{"seek", (PyCFunction)(void(*)(void))_io_TextIOWrapper_seek, METH_FASTCALL, _io_TextIOWrapper_seek__doc__},
323323

324324
static PyObject *
325325
_io_TextIOWrapper_seek_impl(textio *self, PyObject *cookieObj, int whence);
@@ -364,7 +364,7 @@ PyDoc_STRVAR(_io_TextIOWrapper_truncate__doc__,
364364
"\n");
365365

366366
#define _IO_TEXTIOWRAPPER_TRUNCATE_METHODDEF \
367-
{"truncate", (PyCFunction)(void *)_io_TextIOWrapper_truncate, METH_FASTCALL, _io_TextIOWrapper_truncate__doc__},
367+
{"truncate", (PyCFunction)(void(*)(void))_io_TextIOWrapper_truncate, METH_FASTCALL, _io_TextIOWrapper_truncate__doc__},
368368

369369
static PyObject *
370370
_io_TextIOWrapper_truncate_impl(textio *self, PyObject *pos);
@@ -504,4 +504,4 @@ _io_TextIOWrapper_close(textio *self, PyObject *Py_UNUSED(ignored))
504504
{
505505
return _io_TextIOWrapper_close_impl(self);
506506
}
507-
/*[clinic end generated code: output=a0f6a72181295860 input=a9049054013a1b77]*/
507+
/*[clinic end generated code: output=a811badd76bfe92e input=a9049054013a1b77]*/

‎Modules/_io/clinic/winconsoleio.c.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ PyDoc_STRVAR(_io__WindowsConsoleIO_read__doc__,
209209
"Return an empty bytes object at EOF.");
210210

211211
#define _IO__WINDOWSCONSOLEIO_READ_METHODDEF \
212-
{"read", (PyCFunction)(void *)_io__WindowsConsoleIO_read, METH_FASTCALL, _io__WindowsConsoleIO_read__doc__},
212+
{"read", (PyCFunction)(void(*)(void))_io__WindowsConsoleIO_read, METH_FASTCALL, _io__WindowsConsoleIO_read__doc__},
213213

214214
static PyObject *
215215
_io__WindowsConsoleIO_read_impl(winconsoleio *self, Py_ssize_t size);
@@ -328,4 +328,4 @@ _io__WindowsConsoleIO_isatty(winconsoleio *self, PyObject *Py_UNUSED(ignored))
328328
#ifndef _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
329329
#define _IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF
330330
#endif /* !defined(_IO__WINDOWSCONSOLEIO_ISATTY_METHODDEF) */
331-
/*[clinic end generated code: output=dbea63fb79479ee0 input=a9049054013a1b77]*/
331+
/*[clinic end generated code: output=080af41338394b49 input=a9049054013a1b77]*/

0 commit comments

Comments
 (0)