traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A few more gcc warnings bite the dust.

This commit is contained in:
Jack Jansen 2001-09-05 15:44:37 +00:00
parent 28341ceb8f
commit 044d95e9f7
5 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/Modules/qd/_Qdmodule.c
View File

@ -122,7 +122,7 @@ PyObject *QdRGB_New(RGBColorPtr itself)
return Py_BuildValue("lll", (long)itself->red, (long)itself->green, (long)itself->blue); 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; long red, green, blue;

2
Mac/Modules/qd/qdsupport.py
View File

@ -167,7 +167,7 @@ PyObject *QdRGB_New(RGBColorPtr itself)
return Py_BuildValue("lll", (long)itself->red, (long)itself->green, (long)itself->blue); 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; long red, green, blue;

9
Mac/Modules/res/_Resmodule.c
View File

@ -440,7 +440,8 @@ static PyObject *ResObj_AutoDispose(ResourceObject *_self, PyObject *_args)
_self->ob_freeit = PyMac_AutoDisposeHandle; _self->ob_freeit = PyMac_AutoDisposeHandle;
else else
_self->ob_freeit = NULL; _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); HLock(h);
memcpy(*h, buf, len); memcpy(*h, buf, len);
HUnlock(h); 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); HUnlock(h);
rv = (ResourceObject *)ResObj_New(h); rv = (ResourceObject *)ResObj_New(h);
rv->ob_freeit = PyMac_AutoDisposeHandle; rv->ob_freeit = PyMac_AutoDisposeHandle;
return (PyObject *)rv; _res = (PyObject *)rv;
return _res;
} }

9
Mac/Modules/res/resedit.py
View File

@ -13,7 +13,8 @@ if ( h == NULL ) {
HLock(h); HLock(h);
memcpy(*h, buf, len); memcpy(*h, buf, len);
HUnlock(h); HUnlock(h);
return ResObj_New(h); _res = ResObj_New(h);
return _res;
""" """
f = ManualGenerator("Resource", resource_body) f = ManualGenerator("Resource", resource_body)
@ -43,7 +44,8 @@ memcpy(*h, buf, len);
HUnlock(h); HUnlock(h);
rv = (ResourceObject *)ResObj_New(h); rv = (ResourceObject *)ResObj_New(h);
rv->ob_freeit = PyMac_AutoDisposeHandle; rv->ob_freeit = PyMac_AutoDisposeHandle;
return (PyObject *)rv; _res = (PyObject *)rv;
return _res;
""" """
f = ManualGenerator("Handle", handle_body) f = ManualGenerator("Handle", handle_body)
@ -92,7 +94,8 @@ if ( onoff )
_self->ob_freeit = PyMac_AutoDisposeHandle; _self->ob_freeit = PyMac_AutoDisposeHandle;
else else
_self->ob_freeit = NULL; _self->ob_freeit = NULL;
return Py_BuildValue("i", old); _res = Py_BuildValue("i", old);
return _res;
""" """
f = ManualGenerator("AutoDispose", AutoDispose_body) f = ManualGenerator("AutoDispose", AutoDispose_body)
f.docstring = lambda: "(int)->int. Automatically DisposeHandle the object on Python object cleanup" f.docstring = lambda: "(int)->int. Automatically DisposeHandle the object on Python object cleanup"

17
Mac/Modules/waste/wastemodule.c
View File

@ -5,8 +5,20 @@
#ifdef _WIN32
#include "pywintoolbox.h"
#else
#include "macglue.h" #include "macglue.h"
#include "pymactoolbox.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 <WASTE.h>
#include <WEObjectHandlers.h> #include <WEObjectHandlers.h>
@ -213,7 +225,7 @@ PyObject *WEOObj_New(WEObjectReference itself)
it->ob_itself = itself; it->ob_itself = itself;
return (PyObject *)it; return (PyObject *)it;
} }
WEOObj_Convert(PyObject *v, WEObjectReference *p_itself) int WEOObj_Convert(PyObject *v, WEObjectReference *p_itself)
{ {
if (!WEOObj_Check(v)) if (!WEOObj_Check(v))
{ {
@ -381,7 +393,7 @@ PyObject *wasteObj_New(WEReference itself)
WESetInfo(weRefCon, (void *)&it, itself); WESetInfo(weRefCon, (void *)&it, itself);
return (PyObject *)it; return (PyObject *)it;
} }
wasteObj_Convert(PyObject *v, WEReference *p_itself) int wasteObj_Convert(PyObject *v, WEReference *p_itself)
{ {
if (!wasteObj_Check(v)) if (!wasteObj_Check(v))
{ {
@ -1061,7 +1073,6 @@ static PyObject *wasteObj_WEInsert(wasteObject *_self, PyObject *_args)
if (_err != noErr) return PyMac_Error(_err); if (_err != noErr) return PyMac_Error(_err);
Py_INCREF(Py_None); Py_INCREF(Py_None);
_res = Py_None; _res = Py_None;
pText__error__: ;
return _res; return _res;
} }