[Python-checkins] CVS: python/dist/src/Mac/Modules Nav.c,1.14,1.15 icgluemodule.c,1.5,1.6
Jack Jansen
jackjansen@users.sourceforge.net
Tue, 04 Sep 2001 15:20:41 -0700
Update of /cvsroot/python/python/dist/src/Mac/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv14791
Modified Files:
Nav.c icgluemodule.c
Log Message:
Added prototypes to silence gcc strict-prototype warnings.
Fixed a few missing return values.
Index: Nav.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/Nav.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Nav.c 2001/09/02 00:08:16 1.14
--- Nav.c 2001/09/04 22:20:39 1.15
***************
*** 89,96 ****
Boolean c_rv = false;
! if (!dict) return;
if ( (pyfunc = PyDict_GetItemString(dict, "previewProc")) == NULL ) {
PyErr_Clear();
! return;
}
rv = PyObject_CallFunction(pyfunc, "s#", (void *)callBackParms, sizeof(NavCBRec));
--- 89,96 ----
Boolean c_rv = false;
! if (!dict) return false;
if ( (pyfunc = PyDict_GetItemString(dict, "previewProc")) == NULL ) {
PyErr_Clear();
! return false;
}
rv = PyObject_CallFunction(pyfunc, "s#", (void *)callBackParms, sizeof(NavCBRec));
***************
*** 115,122 ****
Boolean c_rv = false;
! if (!dict) return;
if ( (pyfunc = PyDict_GetItemString(dict, "filterProc")) == NULL ) {
PyErr_Clear();
! return;
}
rv = PyObject_CallFunction(pyfunc, "O&s#h",
--- 115,122 ----
Boolean c_rv = false;
! if (!dict) return false;
if ( (pyfunc = PyDict_GetItemString(dict, "filterProc")) == NULL ) {
PyErr_Clear();
! return false;
}
rv = PyObject_CallFunction(pyfunc, "O&s#h",
***************
*** 245,251 ****
static PyObject *
! nav_NavTranslateFile(self, args)
! navrrobject *self;
! PyObject *args;
{
NavTranslationOptions howToTranslate;
--- 245,249 ----
static PyObject *
! nav_NavTranslateFile(navrrobject *self, PyObject *args)
{
NavTranslationOptions howToTranslate;
***************
*** 268,274 ****
static PyObject *
! nav_NavCompleteSave(self, args)
! navrrobject *self;
! PyObject *args;
{
NavTranslationOptions howToTranslate;
--- 266,270 ----
static PyObject *
! nav_NavCompleteSave(navrrobject *self, PyObject *args)
{
NavTranslationOptions howToTranslate;
***************
*** 311,316 ****
static void
! navrr_dealloc(self)
! navrrobject *self;
{
NavDisposeReply(&self->itself);
--- 307,311 ----
static void
! navrr_dealloc(navrrobject *self)
{
NavDisposeReply(&self->itself);
***************
*** 319,325 ****
static PyObject *
! navrr_getattr(self, name)
! navrrobject *self;
! char *name;
{
FSSpec fss;
--- 314,318 ----
static PyObject *
! navrr_getattr(navrrobject *self, char *name)
{
FSSpec fss;
***************
*** 380,387 ****
static int
! navrr_setattr(self, name, v)
! navrrobject *self;
! char *name;
! PyObject *v;
{
/* Set attribute 'name' to value 'v'. v==NULL means delete */
--- 373,377 ----
static int
! navrr_setattr(navrrobject *self, char *name, PyObject *v)
{
/* Set attribute 'name' to value 'v'. v==NULL means delete */
***************
*** 429,436 ****
static PyObject *
! nav_NavGetFile(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 419,423 ----
static PyObject *
! nav_NavGetFile(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 467,474 ****
static PyObject *
! nav_NavPutFile(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 454,458 ----
static PyObject *
! nav_NavPutFile(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 505,512 ****
static PyObject *
! nav_NavAskSaveChanges(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 489,493 ----
static PyObject *
! nav_NavAskSaveChanges(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 538,545 ****
static PyObject *
! nav_NavCustomAskSaveChanges(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 519,523 ----
static PyObject *
! nav_NavCustomAskSaveChanges(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 570,577 ****
static PyObject *
! nav_NavAskDiscardChanges(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 548,552 ----
static PyObject *
! nav_NavAskDiscardChanges(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 602,609 ****
static PyObject *
! nav_NavChooseFile(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 577,581 ----
static PyObject *
! nav_NavChooseFile(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 640,647 ****
static PyObject *
! nav_NavChooseFolder(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 612,616 ----
static PyObject *
! nav_NavChooseFolder(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 676,683 ****
static PyObject *
! nav_NavChooseVolume(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 645,649 ----
static PyObject *
! nav_NavChooseVolume(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 712,719 ****
static PyObject *
! nav_NavChooseObject(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 678,682 ----
static PyObject *
! nav_NavChooseObject(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 748,755 ****
static PyObject *
! nav_NavNewFolder(self, args, kw)
! PyObject *self; /* Not used */
! PyObject *args;
! PyObject *kw;
{
PyObject *dict;
--- 711,715 ----
static PyObject *
! nav_NavNewFolder(PyObject *self, PyObject *args, PyObject *kw)
{
PyObject *dict;
***************
*** 785,791 ****
static PyObject *
! nav_NavCustomControl(self, args)
! PyObject *self; /* Not used */
! PyObject *args;
{
--- 745,749 ----
static PyObject *
! nav_NavCustomControl(PyObject *self, PyObject *args)
{
***************
*** 802,808 ****
static PyObject *
! nav_NavServicesCanRun(self, args)
! PyObject *self; /* Not used */
! PyObject *args;
{
Boolean rv;
--- 760,764 ----
static PyObject *
! nav_NavServicesCanRun(PyObject *self, PyObject *args)
{
Boolean rv;
***************
*** 818,824 ****
static PyObject *
! nav_NavServicesAvailable(self, args)
! PyObject *self; /* Not used */
! PyObject *args;
{
Boolean rv;
--- 774,778 ----
static PyObject *
! nav_NavServicesAvailable(PyObject *self, PyObject *args)
{
Boolean rv;
***************
*** 835,841 ****
static PyObject *
! nav_NavLoad(self, args)
! PyObject *self; /* Not used */
! PyObject *args;
{
--- 789,793 ----
static PyObject *
! nav_NavLoad(PyObject *self, PyObject *args)
{
***************
*** 852,858 ****
static PyObject *
! nav_NavUnload(self, args)
! PyObject *self; /* Not used */
! PyObject *args;
{
--- 804,808 ----
static PyObject *
! nav_NavUnload(PyObject *self, PyObject *args)
{
***************
*** 869,875 ****
static PyObject *
! nav_NavLibraryVersion(self, args)
! PyObject *self; /* Not used */
! PyObject *args;
{
UInt32 rv;
--- 819,823 ----
static PyObject *
! nav_NavLibraryVersion(PyObject *self, PyObject *args)
{
UInt32 rv;
***************
*** 886,892 ****
static PyObject *
! nav_NavGetDefaultDialogOptions(self, args)
! PyObject *self; /* Not used */
! PyObject *args;
{
NavDialogOptions dialogOptions;
--- 834,838 ----
static PyObject *
! nav_NavGetDefaultDialogOptions(PyObject *self, PyObject *args)
{
NavDialogOptions dialogOptions;
***************
*** 950,954 ****
void
! initNav()
{
PyObject *m, *d;
--- 896,900 ----
void
! initNav(void)
{
PyObject *m, *d;
Index: icgluemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/icgluemodule.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** icgluemodule.c 2001/05/19 12:34:59 1.5
--- icgluemodule.c 2001/09/04 22:20:39 1.6
***************
*** 89,95 ****
static PyObject *
! ici_ICFindConfigFile(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 89,93 ----
static PyObject *
! ici_ICFindConfigFile(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 109,115 ****
static PyObject *
! ici_ICFindUserConfigFile(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 107,111 ----
static PyObject *
! ici_ICFindUserConfigFile(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 130,136 ****
static PyObject *
! ici_ICChooseConfig(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 126,130 ----
static PyObject *
! ici_ICChooseConfig(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 149,155 ****
static PyObject *
! ici_ICChooseNewConfig(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 143,147 ----
static PyObject *
! ici_ICChooseNewConfig(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 170,176 ****
static PyObject *
! ici_ICGetSeed(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 162,166 ----
static PyObject *
! ici_ICGetSeed(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 190,196 ****
static PyObject *
! ici_ICBegin(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 180,184 ----
static PyObject *
! ici_ICBegin(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 211,217 ****
static PyObject *
! ici_ICFindPrefHandle(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 199,203 ----
static PyObject *
! ici_ICFindPrefHandle(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 233,239 ****
static PyObject *
! ici_ICSetPref(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 219,223 ----
static PyObject *
! ici_ICSetPref(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 259,265 ****
static PyObject *
! ici_ICCountPref(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 243,247 ----
static PyObject *
! ici_ICCountPref(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 279,285 ****
static PyObject *
! ici_ICGetIndPref(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 261,265 ----
static PyObject *
! ici_ICGetIndPref(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 300,306 ****
static PyObject *
! ici_ICDeletePref(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 280,284 ----
static PyObject *
! ici_ICDeletePref(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 321,327 ****
static PyObject *
! ici_ICEnd(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 299,303 ----
static PyObject *
! ici_ICEnd(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 341,347 ****
static PyObject *
! ici_ICEditPreferences(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 317,321 ----
static PyObject *
! ici_ICEditPreferences(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 362,368 ****
static PyObject *
! ici_ICParseURL(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 336,340 ----
static PyObject *
! ici_ICParseURL(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 388,394 ****
static PyObject *
! ici_ICLaunchURL(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 360,364 ----
static PyObject *
! ici_ICLaunchURL(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 413,419 ****
static PyObject *
! ici_ICMapFilename(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 383,387 ----
static PyObject *
! ici_ICMapFilename(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 443,449 ****
static PyObject *
! ici_ICMapTypeCreator(self, args)
! iciobject *self;
! PyObject *args;
{
ICError err;
--- 411,415 ----
static PyObject *
! ici_ICMapTypeCreator(iciobject *self, PyObject *args)
{
ICError err;
***************
*** 518,523 ****
static void
! ici_dealloc(self)
! iciobject *self;
{
(void)ICStop(self->inst);
--- 484,488 ----
static void
! ici_dealloc(iciobject *self)
{
(void)ICStop(self->inst);
***************
*** 526,532 ****
static PyObject *
! ici_getattr(self, name)
! iciobject *self;
! char *name;
{
return Py_FindMethod(ici_methods, (PyObject *)self, name);
--- 491,495 ----
static PyObject *
! ici_getattr(iciobject *self, char *name)
{
return Py_FindMethod(ici_methods, (PyObject *)self, name);
***************
*** 571,577 ****
static PyObject *
! ic_ICStart(self, args)
! PyObject *self; /* Not used */
! PyObject *args;
{
OSType creator;
--- 534,538 ----
static PyObject *
! ic_ICStart(PyObject *self, PyObject *args)
{
OSType creator;
***************
*** 598,602 ****
void
! initicglue()
{
PyObject *m, *d;
--- 559,563 ----
void
! initicglue(void)
{
PyObject *m, *d;