mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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;
int tocopy;
err = FSMakeFSSpec(fss->vRefNum, fss->parID, "", &fss2);
err = FSMakeFSSpec(fss->vRefNum, fss->parID,
(unsigned char*)"", &fss2);
if (err)
return err;
err = FSpMakeFSRef(&fss2, &fsr);
if (err)
return err;
err = (OSErr)FSRefMakePath(&fsr, path, len-1);
err = (OSErr)FSRefMakePath(&fsr, (unsigned char*)path, len-1);
if (err)
return err;
/* 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)
tocopy = len - strlen(path) - 1;
if (tocopy > 0)
strncat(path, fss->name+1, tocopy);
strncat(path, (char*)fss->name+1, tocopy);
}
else {
if (err)
return err;
err = (OSErr)FSRefMakePath(&fsr, path, len);
err = (OSErr)FSRefMakePath(&fsr, (unsigned char*)path, len);
if (err)
return err;
}