Update of /cvsroot/opengtoolkit/lvzip/c_source
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18847/c_source
Modified Files:
macbin.c macbin.h
Log Message:
Index: macbin.c
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/macbin.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** macbin.c 23 May 2006 12:47:29 -0000 1.23
--- macbin.c 23 May 2006 13:18:44 -0000 1.24
***************
*** 80,88 ****
}
! static MgErr OpenResourceFork(FSSpec *fss, uInt32 openMode, uInt32 denyMode, int32 *ioRefnum)
{
int16 perm;
HParamBlockRec pb;
- FSSpec fss;
Boolean hasDeny = HasFMExtension(fss, 1L << bHasOpenDeny);
--- 80,88 ----
}
! static MgErr OpenResourceFork(FSSpec *fss, uInt32 openMode, uInt32 denyMode, File *ioRefnum)
{
int16 perm;
+ MgErr err;
HParamBlockRec pb;
Boolean hasDeny = HasFMExtension(fss, 1L << bHasOpenDeny);
***************
*** 125,131 ****
pb.fileParam.ioCompletion = 0;
! pb.fileParam.ioNamePtr = fss.name;
! pb.fileParam.ioVRefNum = fss.vRefNum;
! pb.fileParam.ioDirID = fss.parID;
pb.ioParam.ioMisc = NULL;
pb.accessParam.ioDenyModes = perm;
--- 125,131 ----
pb.fileParam.ioCompletion = 0;
! pb.fileParam.ioNamePtr = fss->name;
! pb.fileParam.ioVRefNum = fss->vRefNum;
! pb.fileParam.ioDirID = fss->parID;
pb.ioParam.ioMisc = NULL;
pb.accessParam.ioDenyModes = perm;
***************
*** 154,158 ****
! static MgErr UtilFileInfo(FSSpec fss, uInt8 write, LVFileInfo *fileInfo, PStr comment)
{
DTPBRec dtpb;
--- 154,158 ----
! static MgErr UtilFileInfo(FSSpec *fss, uInt8 write, LVFileInfo *fileInfo, PStr comment)
{
DTPBRec dtpb;
***************
*** 164,170 ****
memset(&cpb, 0, sizeof(CInfoPBRec));
! cpb.hFileInfo.ioNamePtr = fss.name;
! cpb.hFileInfo.ioVRefNum = fss.vRefNum;
! cpb.hFileInfo.ioDirID = fss.parID;
err = OSErrToLVErr(PBGetCatInfoSync(&cpb));
--- 164,170 ----
memset(&cpb, 0, sizeof(CInfoPBRec));
! cpb.hFileInfo.ioNamePtr = fss->name;
! cpb.hFileInfo.ioVRefNum = fss->vRefNum;
! cpb.hFileInfo.ioDirID = fss->parID;
err = OSErrToLVErr(PBGetCatInfoSync(&cpb));
***************
*** 176,180 ****
dtpb.ioCompletion = nil;
dtpb.ioNamePtr = NULL;
! dtpb.ioVRefNum = fss.vRefNum;
err = OSErrToLVErr(PBDTGetPath(&dtpb));
--- 176,180 ----
dtpb.ioCompletion = nil;
dtpb.ioNamePtr = NULL;
! dtpb.ioVRefNum = fss->vRefNum;
err = OSErrToLVErr(PBDTGetPath(&dtpb));
***************
*** 183,188 ****
if (!err)
{
! dtpb.ioNamePtr = fss.name;
! dtpb.ioDirID = fss.parID;
dtpb.ioDTBuffer = comment;
if (comment)
--- 183,188 ----
if (!err)
{
! dtpb.ioNamePtr = fss->name;
! dtpb.ioDirID = fss->parID;
dtpb.ioDTBuffer = comment;
if (comment)
***************
*** 292,305 ****
}
! extern MgErr ZEXPORT LV_OpenResFork(LVRefNum *refnum, PStr path, uInt32 openMode, uInt32 denyMode)
{
MgErr err = mgNotSupported;
#if Mac
FSSpec fss;
! int32 ioRefNum;
*refnum = 0;
! if (err = MakeFSpec(path, &fss))
{
DbgPrintf("MakeFSpec: err = %ld", err);
--- 292,305 ----
}
! extern MgErr ZEXPORT LV_OpenResFork(File *refnum, PStr path, uInt32 openMode, uInt32 denyMode)
{
MgErr err = mgNotSupported;
#if Mac
FSSpec fss;
! File ioRefNum;
*refnum = 0;
! if (err = MakeFSpec(0, 0, path, &fss))
{
DbgPrintf("MakeFSpec: err = %ld", err);
***************
*** 308,313 ****
err = OpenResourceFork(&fss, openMode, denyMode, &ioRefNum);
- if (!err)
- err = FNewRefNum(path, (File)ioRefNum, refnum);
#else
*refnum = 0;
--- 308,311 ----
***************
*** 328,332 ****
MgErr err;
! if (err = MakeFSpec(path, &fss))
{
DbgPrintf("MakeMacSpec: err = %ld", err);
--- 326,330 ----
MgErr err;
! if (err = MakeFSpec(0, 0, path, &fss))
{
DbgPrintf("MakeMacSpec: err = %ld", err);
***************
*** 455,459 ****
#if Mac
FSSpec fss;
! int32 ioRefNum;
*refnum = 0;
--- 453,457 ----
#if Mac
FSSpec fss;
! File ioRefNum;
*refnum = 0;
***************
*** 467,471 ****
err = OpenResourceFork(&fss, openMode, denyMode, &ioRefNum);
if (!err)
! err = FNewRefNum(path, (File)ioRefNum, refnum);
#else
*refnum = 0;
--- 465,469 ----
err = OpenResourceFork(&fss, openMode, denyMode, &ioRefNum);
if (!err)
! err = FNewRefNum(path, ioRefNum, refnum);
#else
*refnum = 0;
Index: macbin.h
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/macbin.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** macbin.h 23 May 2006 12:47:29 -0000 1.16
--- macbin.h 23 May 2006 13:18:44 -0000 1.17
***************
*** 209,213 ****
PStr comment));
! extern MgErr ZEXPORT LV_OpenResFork OF((LVRefNum *refnum,
PStr path,
uInt32 openMode,
--- 209,213 ----
PStr comment));
! extern MgErr ZEXPORT LV_OpenResFork OF((File *refnum,
PStr path,
uInt32 openMode,
|
