const poisoning, spreading to fix new const warnings

tim-one · tim-one · commit c3d12ac88ced · 2005-12-24T06:03:06.000Z
in _winreg.c.
diff --git a/Include/structmember.h b/Include/structmember.h
@@ -79,11 +79,11 @@ typedef struct PyMemberDef {
 
 
 /* Obsolete API, for binary backwards compatibility */
-PyAPI_FUNC(PyObject *) PyMember_Get(char *, struct memberlist *, char *);
-PyAPI_FUNC(int) PyMember_Set(char *, struct memberlist *, char *, PyObject *);
+PyAPI_FUNC(PyObject *) PyMember_Get(const char *, struct memberlist *, const char *);
+PyAPI_FUNC(int) PyMember_Set(char *, struct memberlist *, const char *, PyObject *);
 
 /* Current API, use this */
-PyAPI_FUNC(PyObject *) PyMember_GetOne(char *, struct PyMemberDef *);
+PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *);
 PyAPI_FUNC(int) PyMember_SetOne(char *, struct PyMemberDef *, PyObject *);
 
 
diff --git a/PC/_winreg.c b/PC/_winreg.c
@@ -455,7 +455,7 @@ static PyNumberMethods PyHKEY_NumberMethods =
 
 
 /* fwd declare __getattr__ */
-static PyObject *PyHKEY_getattr(PyObject *self, char *name);
+static PyObject *PyHKEY_getattr(PyObject *self, const char *name);
 
 /* The type itself */
 PyTypeObject PyHKEY_Type =
@@ -526,7 +526,7 @@ static struct PyMethodDef PyHKEY_methods[] = {
 };
 
 /*static*/ PyObject *
-PyHKEY_getattr(PyObject *self, char *name)
+PyHKEY_getattr(PyObject *self, const char *name)
 {
 	PyObject *res;
 
diff --git a/Python/structmember.c b/Python/structmember.c
@@ -29,7 +29,7 @@ listmembers(struct memberlist *mlist)
 }
 
 PyObject *
-PyMember_Get(char *addr, struct memberlist *mlist, char *name)
+PyMember_Get(const char *addr, struct memberlist *mlist, const char *name)
 {
 	struct memberlist *l;
 
@@ -51,7 +51,7 @@ PyMember_Get(char *addr, struct memberlist *mlist, char *name)
 }
 
 PyObject *
-PyMember_GetOne(char *addr, PyMemberDef *l)
+PyMember_GetOne(const char *addr, PyMemberDef *l)
 {
 	PyObject *v;
 	if ((l->flags & READ_RESTRICTED) &&
@@ -134,7 +134,7 @@ PyMember_GetOne(char *addr, PyMemberDef *l)
 }
 
 int
-PyMember_Set(char *addr, struct memberlist *mlist, char *name, PyObject *v)
+PyMember_Set(char *addr, struct memberlist *mlist, const char *name, PyObject *v)
 {
 	struct memberlist *l;
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ listmembers(struct memberlist *mlist)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`PyObject *`
`32`		`-PyMember_Get(char addr, struct memberlist mlist, char *name)`
	`32`	`+PyMember_Get(const char addr, struct memberlist mlist, const char *name)`
`33`	`33`	`{`
`34`	`34`	`struct memberlist *l;`
`35`	`35`
`@@ -51,7 +51,7 @@ PyMember_Get(char addr, struct memberlist mlist, char *name)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`PyObject *`
`54`		`-PyMember_GetOne(char addr, PyMemberDef l)`
	`54`	`+PyMember_GetOne(const char addr, PyMemberDef l)`
`55`	`55`	`{`
`56`	`56`	`PyObject *v;`
`57`	`57`	`if ((l->flags & READ_RESTRICTED) &&`
`@@ -134,7 +134,7 @@ PyMember_GetOne(char addr, PyMemberDef l)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`int`
`137`		`-PyMember_Set(char addr, struct memberlist mlist, char name, PyObject v)`
	`137`	`+PyMember_Set(char addr, struct memberlist mlist, const char name, PyObject v)`
`138`	`138`	`{`
`139`	`139`	`struct memberlist *l;`
`140`	`140`