mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 23:53:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 71031 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71031 | brett.cannon | 2009-04-01 20:17:39 -0700 (Wed, 01 Apr 2009) | 6 lines

  PyImport_AppendInittab() took a char * as a first argument even though that
  string was stored beyond the life of the call. Changed the signature to be
  const char * to help make this point.

  Closes issue #1419652.
........
This commit is contained in:
Brett Cannon 2009-04-02 03:41:46 +00:00
parent 3e2ea79bda
commit a826f32054
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/c-api/import.rst
View file

@ -200,7 +200,7 @@ Importing Modules
tricks with this to provide a dynamically created collection of frozen modules. tricks with this to provide a dynamically created collection of frozen modules.
.. cfunction:: int PyImport_AppendInittab(char *name, PyObject* (*initfunc)(void)) .. cfunction:: int PyImport_AppendInittab(const char *name, PyObject* (*initfunc)(void))
Add a single module to the existing table of built-in modules. This is a Add a single module to the existing table of built-in modules. This is a
convenience wrapper around :cfunc:`PyImport_ExtendInittab`, returning ``-1`` if convenience wrapper around :cfunc:`PyImport_ExtendInittab`, returning ``-1`` if

2
Include/import.h
View file

@ -43,7 +43,7 @@ struct _inittab {
PyAPI_DATA(PyTypeObject) PyNullImporter_Type; PyAPI_DATA(PyTypeObject) PyNullImporter_Type;
PyAPI_DATA(struct _inittab *) PyImport_Inittab; PyAPI_DATA(struct _inittab *) PyImport_Inittab;
PyAPI_FUNC(int) PyImport_AppendInittab(char *name, PyObject* (*initfunc)(void)); PyAPI_FUNC(int) PyImport_AppendInittab(const char *name, PyObject* (*initfunc)(void));
PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab); PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab);
struct _frozen { struct _frozen {

4
Python/import.c
View file

@ -3488,13 +3488,13 @@ PyImport_ExtendInittab(struct _inittab *newtab)
/* Shorthand to add a single entry given a name and a function */ /* Shorthand to add a single entry given a name and a function */
int int
PyImport_AppendInittab(char *name, PyObject* (*initfunc)(void)) PyImport_AppendInittab(const char *name, PyObject* (*initfunc)(void))
{ {
struct _inittab newtab[2]; struct _inittab newtab[2];
memset(newtab, '\0', sizeof newtab); memset(newtab, '\0', sizeof newtab);
newtab[0].name = name; newtab[0].name = (char *)name;
newtab[0].initfunc = initfunc; newtab[0].initfunc = initfunc;
return PyImport_ExtendInittab(newtab); return PyImport_ExtendInittab(newtab);