Fix nearly all compilation warnings under Apple gcc-4.0. Tested with OPT="-g

jyasskin · jyasskin · commit 7937d939b1e4 · 2009-05-29T03:44:31.000Z
-Wall -Wstrict-prototypes -Werror" in both --with-pydebug mode and --without.
There's still a batch of non-prototype warnings in Xlib.h that I don't know how
to fix.
diff --git a/Mac/Modules/carbonevt/_CarbonEvtmodule.c b/Mac/Modules/carbonevt/_CarbonEvtmodule.c
@@ -27,12 +27,6 @@ PyObject *EventHandlerCallRef_New(EventHandlerCallRef itself);
 PyObject *EventRef_New(EventRef itself);
 
 /********** EventTypeSpec *******/
-static PyObject*
-EventTypeSpec_New(EventTypeSpec *in)
-{
-        return Py_BuildValue("ll", in->eventClass, in->eventKind);
-}
-
 static int
 EventTypeSpec_Convert(PyObject *v, EventTypeSpec *out)
 {
@@ -67,12 +61,6 @@ HIPoint_Convert(PyObject *v, HIPoint *out)
 
 /********** EventHotKeyID *******/
 
-static PyObject*
-EventHotKeyID_New(EventHotKeyID *in)
-{
-        return Py_BuildValue("ll", in->signature, in->id);
-}
-
 static int
 EventHotKeyID_Convert(PyObject *v, EventHotKeyID *out)
 {
diff --git a/Mac/Modules/ctl/_Ctlmodule.c b/Mac/Modules/ctl/_Ctlmodule.c
@@ -1598,7 +1598,7 @@ static PyObject *CtlObj_GetBevelButtonMenuValue(ControlObject *_self, PyObject *
 {
 	PyObject *_res = NULL;
 	OSErr _err;
-	SInt16 outValue;
+	UInt16 outValue;
 #ifndef GetBevelButtonMenuValue
 	PyMac_PRECHECK(GetBevelButtonMenuValue);
 #endif
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -667,7 +667,7 @@ _get_peer_alt_names (X509 *certificate) {
 	char buf[2048];
 	char *vptr;
 	int len;
-	const unsigned char *p;
+	unsigned char *p;
 
 	if (certificate == NULL)
 		return peer_alt_names;
diff --git a/Modules/_struct.c b/Modules/_struct.c
@@ -182,6 +182,7 @@ get_long(PyObject *v, long *p)
 
 /* Same, but handling unsigned long */
 
+#ifndef PY_STRUCT_OVERFLOW_MASKING
 static int
 get_ulong(PyObject *v, unsigned long *p)
 {
@@ -201,6 +202,7 @@ get_ulong(PyObject *v, unsigned long *p)
 	}
 	return 0;
 }
+#endif  /* PY_STRUCT_OVERFLOW_MASKING */
 
 #ifdef HAVE_LONG_LONG
 
diff --git a/Python/compile.c b/Python/compile.c
@@ -535,18 +535,6 @@ compiler_exit_scope(struct compiler *c)
 
 }
 
-/* Allocate a new "anonymous" local variable.
-   Used by list comprehensions and with statements.
-*/
-
-static PyObject *
-compiler_new_tmpname(struct compiler *c)
-{
-	char tmpname[256];
-	PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]", ++c->u->u_tmpname);
-	return PyString_FromString(tmpname);
-}
-
 /* Allocate a new block and return a pointer to it.
    Returns NULL on error.
 */

Original file line number	Diff line number	Diff line change
`@@ -1598,7 +1598,7 @@ static PyObject CtlObj_GetBevelButtonMenuValue(ControlObject _self, PyObject *`
`1598`	`1598`	`{`
`1599`	`1599`	`PyObject *_res = NULL;`
`1600`	`1600`	`OSErr _err;`
`1601`		`- SInt16 outValue;`
	`1601`	`+ UInt16 outValue;`
`1602`	`1602`	`#ifndef GetBevelButtonMenuValue`
`1603`	`1603`	`PyMac_PRECHECK(GetBevelButtonMenuValue);`
`1604`	`1604`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ get_long(PyObject v, long p)`
`182`	`182`
`183`	`183`	`/* Same, but handling unsigned long */`
`184`	`184`
	`185`	`+#ifndef PY_STRUCT_OVERFLOW_MASKING`
`185`	`186`	`static int`
`186`	`187`	`get_ulong(PyObject v, unsigned long p)`
`187`	`188`	`{`
`@@ -201,6 +202,7 @@ get_ulong(PyObject v, unsigned long p)`
`201`	`202`	`}`
`202`	`203`	`return 0;`
`203`	`204`	`}`
	`205`	`+#endif /* PY_STRUCT_OVERFLOW_MASKING */`
`204`	`206`
`205`	`207`	`#ifdef HAVE_LONG_LONG`
`206`	`208`