A few more gcc warnings bite the dust.

jackjansen · jackjansen · commit 044d95e9f7e0 · 2001-09-05T15:44:37.000Z
diff --git a/Mac/Modules/qd/_Qdmodule.c b/Mac/Modules/qd/_Qdmodule.c
@@ -122,7 +122,7 @@ PyObject *QdRGB_New(RGBColorPtr itself)
 	return Py_BuildValue("lll", (long)itself->red, (long)itself->green, (long)itself->blue);
 }
 
-QdRGB_Convert(PyObject *v, RGBColorPtr p_itself)
+int QdRGB_Convert(PyObject *v, RGBColorPtr p_itself)
 {
 	long red, green, blue;
 	
diff --git a/Mac/Modules/qd/qdsupport.py b/Mac/Modules/qd/qdsupport.py
@@ -167,7 +167,7 @@ def declareSize(self, name):
 	return Py_BuildValue("lll", (long)itself->red, (long)itself->green, (long)itself->blue);
 }
 
-QdRGB_Convert(PyObject *v, RGBColorPtr p_itself)
+int QdRGB_Convert(PyObject *v, RGBColorPtr p_itself)
 {
 	long red, green, blue;
 	
diff --git a/Mac/Modules/res/_Resmodule.c b/Mac/Modules/res/_Resmodule.c
@@ -440,7 +440,8 @@ static PyObject *ResObj_AutoDispose(ResourceObject *_self, PyObject *_args)
 		_self->ob_freeit = PyMac_AutoDisposeHandle;
 	else
 		_self->ob_freeit = NULL;
-	return Py_BuildValue("i", old);
+	_res = Py_BuildValue("i", old);
+	return _res;
 
 }
 
@@ -1378,7 +1379,8 @@ static PyObject *Res_Resource(PyObject *_self, PyObject *_args)
 	HLock(h);
 	memcpy(*h, buf, len);
 	HUnlock(h);
-	return ResObj_New(h);
+	_res = ResObj_New(h);
+	return _res;
 
 }
 
@@ -1403,7 +1405,8 @@ static PyObject *Res_Handle(PyObject *_self, PyObject *_args)
 	HUnlock(h);
 	rv = (ResourceObject *)ResObj_New(h);
 	rv->ob_freeit = PyMac_AutoDisposeHandle;
-	return (PyObject *)rv;
+	_res = (PyObject *)rv;
+	return _res;
 
 }
 
diff --git a/Mac/Modules/res/resedit.py b/Mac/Modules/res/resedit.py
@@ -13,7 +13,8 @@
 HLock(h);
 memcpy(*h, buf, len);
 HUnlock(h);
-return ResObj_New(h);
+_res = ResObj_New(h);
+return _res;
 """
 
 f = ManualGenerator("Resource", resource_body)
@@ -43,7 +44,8 @@
 HUnlock(h);
 rv = (ResourceObject *)ResObj_New(h);
 rv->ob_freeit = PyMac_AutoDisposeHandle;
-return (PyObject *)rv;
+_res = (PyObject *)rv;
+return _res;
 """
 
 f = ManualGenerator("Handle", handle_body)
@@ -92,7 +94,8 @@ def genresconverter(longname, shortname):
 	_self->ob_freeit = PyMac_AutoDisposeHandle;
 else
 	_self->ob_freeit = NULL;
-return Py_BuildValue("i", old);
+_res = Py_BuildValue("i", old);
+return _res;
 """
 f = ManualGenerator("AutoDispose", AutoDispose_body)
 f.docstring = lambda: "(int)->int. Automatically DisposeHandle the object on Python object cleanup"
diff --git a/Mac/Modules/waste/wastemodule.c b/Mac/Modules/waste/wastemodule.c
@@ -5,8 +5,20 @@
 
 
 
+#ifdef _WIN32
+#include "pywintoolbox.h"
+#else
 #include "macglue.h"
 #include "pymactoolbox.h"
+#endif
+
+/* Macro to test whether a weak-loaded CFM function exists */
+#define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
+    	PyErr_SetString(PyExc_NotImplementedError, \
+    	"Not available in this shared library/OS version"); \
+    	return NULL; \
+    }} while(0)
+
 
 #include <WASTE.h>
 #include <WEObjectHandlers.h>
@@ -213,7 +225,7 @@ PyObject *WEOObj_New(WEObjectReference itself)
 	it->ob_itself = itself;
 	return (PyObject *)it;
 }
-WEOObj_Convert(PyObject *v, WEObjectReference *p_itself)
+int WEOObj_Convert(PyObject *v, WEObjectReference *p_itself)
 {
 	if (!WEOObj_Check(v))
 	{
@@ -381,7 +393,7 @@ PyObject *wasteObj_New(WEReference itself)
 	WESetInfo(weRefCon, (void *)&it, itself);
 	return (PyObject *)it;
 }
-wasteObj_Convert(PyObject *v, WEReference *p_itself)
+int wasteObj_Convert(PyObject *v, WEReference *p_itself)
 {
 	if (!wasteObj_Check(v))
 	{
@@ -1061,7 +1073,6 @@ static PyObject *wasteObj_WEInsert(wasteObject *_self, PyObject *_args)
 	if (_err != noErr) return PyMac_Error(_err);
 	Py_INCREF(Py_None);
 	_res = Py_None;
- pText__error__: ;
 	return _res;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ PyObject *QdRGB_New(RGBColorPtr itself)`
`122`	`122`	`return Py_BuildValue("lll", (long)itself->red, (long)itself->green, (long)itself->blue);`
`123`	`123`	`}`
`124`	`124`
`125`		`-QdRGB_Convert(PyObject *v, RGBColorPtr p_itself)`
	`125`	`+int QdRGB_Convert(PyObject *v, RGBColorPtr p_itself)`
`126`	`126`	`{`
`127`	`127`	`long red, green, blue;`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ def declareSize(self, name):`
`167`	`167`	`return Py_BuildValue("lll", (long)itself->red, (long)itself->green, (long)itself->blue);`
`168`	`168`	`}`
`169`	`169`
`170`		`-QdRGB_Convert(PyObject *v, RGBColorPtr p_itself)`
	`170`	`+int QdRGB_Convert(PyObject *v, RGBColorPtr p_itself)`
`171`	`171`	`{`
`172`	`172`	`long red, green, blue;`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,20 @@`
`5`	`5`
`6`	`6`
`7`	`7`
	`8`	`+#ifdef _WIN32`
	`9`	`+#include "pywintoolbox.h"`
	`10`	`+#else`
`8`	`11`	`#include "macglue.h"`
`9`	`12`	`#include "pymactoolbox.h"`
	`13`	`+#endif`
	`14`	`+`
	`15`	`+/* Macro to test whether a weak-loaded CFM function exists */`
	`16`	`+#define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\`
	`17`	`+ PyErr_SetString(PyExc_NotImplementedError, \`
	`18`	`+ "Not available in this shared library/OS version"); \`
	`19`	`+ return NULL; \`
	`20`	`+ }} while(0)`
	`21`	`+`
`10`	`22`
`11`	`23`	`#include <WASTE.h>`
`12`	`24`	`#include <WEObjectHandlers.h>`
`@@ -213,7 +225,7 @@ PyObject *WEOObj_New(WEObjectReference itself)`
`213`	`225`	`it->ob_itself = itself;`
`214`	`226`	`return (PyObject *)it;`
`215`	`227`	`}`
`216`		`-WEOObj_Convert(PyObject v, WEObjectReference p_itself)`
	`228`	`+int WEOObj_Convert(PyObject v, WEObjectReference p_itself)`
`217`	`229`	`{`
`218`	`230`	`if (!WEOObj_Check(v))`
`219`	`231`	`{`
`@@ -381,7 +393,7 @@ PyObject *wasteObj_New(WEReference itself)`
`381`	`393`	`WESetInfo(weRefCon, (void *)&it, itself);`
`382`	`394`	`return (PyObject *)it;`
`383`	`395`	`}`
`384`		`-wasteObj_Convert(PyObject v, WEReference p_itself)`
	`396`	`+int wasteObj_Convert(PyObject v, WEReference p_itself)`
`385`	`397`	`{`
`386`	`398`	`if (!wasteObj_Check(v))`
`387`	`399`	`{`
`@@ -1061,7 +1073,6 @@ static PyObject wasteObj_WEInsert(wasteObject _self, PyObject *_args)`
`1061`	`1073`	`if (_err != noErr) return PyMac_Error(_err);`
`1062`	`1074`	`Py_INCREF(Py_None);`
`1063`	`1075`	`_res = Py_None;`
`1064`		`- pText__error__: ;`
`1065`	`1076`	`return _res;`
`1066`	`1077`	`}`
`1067`	`1078`