mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-31 23:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix some warnings on Mac OS X 10.4

Browse source
This commit is contained in:
Neal Norwitz 2006-04-28 05:28:05 +00:00
parent dd28d1c6c2
commit 82d4cc27c6
3 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mac/Modules/file/_Filemodule.c
View file

@ -105,13 +105,14 @@ _PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
FSSpec fss2; FSSpec fss2;
int tocopy; int tocopy;
err = FSMakeFSSpec(fss->vRefNum, fss->parID, "", &fss2); err = FSMakeFSSpec(fss->vRefNum, fss->parID,
(unsigned char*)"", &fss2);
if (err) if (err)
return err; return err;
err = FSpMakeFSRef(&fss2, &fsr); err = FSpMakeFSRef(&fss2, &fsr);
if (err) if (err)
return err; return err;
err = (OSErr)FSRefMakePath(&fsr, path, len-1); err = (OSErr)FSRefMakePath(&fsr, (unsigned char*)path, len-1);
if (err) if (err)
return err; return err;
/* This part is not 100% safe: we append the filename part, but /* This part is not 100% safe: we append the filename part, but
@ -123,12 +124,12 @@ _PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
if ((strlen(path) + tocopy) >= len) if ((strlen(path) + tocopy) >= len)
tocopy = len - strlen(path) - 1; tocopy = len - strlen(path) - 1;
if (tocopy > 0) if (tocopy > 0)
strncat(path, fss->name+1, tocopy); strncat(path, (char*)fss->name+1, tocopy);
} }
else { else {
if (err) if (err)
return err; return err;
err = (OSErr)FSRefMakePath(&fsr, path, len); err = (OSErr)FSRefMakePath(&fsr, (unsigned char*)path, len);
if (err) if (err)
return err; return err;
} }

17
Mac/Modules/mlte/_Mltemodule.c
View file

@ -48,23 +48,6 @@ OptFSSpecPtr_Convert(PyObject *v, FSSpec **p_itself)
return PyMac_GetFSSpec(v, *p_itself); return PyMac_GetFSSpec(v, *p_itself);
} }
/*
** Parse an optional rect
*/
static int
OptRectPtr_Convert(PyObject *v, Rect **p_itself)
{
static Rect r;
if (v == Py_None)
{
*p_itself = NULL;
return 1;
}
*p_itself = &r;
return PyMac_GetRect(v, *p_itself);
}
/* /*
** Parse an optional GWorld ** Parse an optional GWorld
*/ */

4
Modules/_sqlite/cursor.c
View file

@ -27,8 +27,12 @@
#include "sqlitecompat.h" #include "sqlitecompat.h"
/* used to decide wether to call PyInt_FromLong or PyLong_FromLongLong */ /* used to decide wether to call PyInt_FromLong or PyLong_FromLongLong */
#ifndef INT32_MIN
#define INT32_MIN (-2147483647 - 1) #define INT32_MIN (-2147483647 - 1)
#endif
#ifndef INT32_MAX
#define INT32_MAX 2147483647 #define INT32_MAX 2147483647
#endif
PyObject* cursor_iternext(Cursor *self); PyObject* cursor_iternext(Cursor *self);