[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1512] trunk/lvzip/c_source

[<lab...@us...>]

Revision: 1512
          http://sourceforge.net/p/opengtoolkit/svn/1512
Author:   labviewer
Date:     2015-05-01 20:41:54 +0000 (Fri, 01 May 2015)
Log Message:
-----------
Fix call to LabVIEW file manager functions

Modified Paths:
--------------
    trunk/lvzip/c_source/lvutil.c
    trunk/lvzip/c_source/lvutil.h

Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c	2015-05-01 20:27:03 UTC (rev 1511)
+++ trunk/lvzip/c_source/lvutil.c	2015-05-01 20:41:54 UTC (rev 1512)
@@ -1068,9 +1068,7 @@
 
 static MgErr lvfile_Read(FileRefNum ioRefNum, uInt32 inCount, uInt32 *outCount, UPtr buffer)
 {
-#if MacOSX
-	OSErr	err;
-#elif Unix
+#if Unix
 	MgErr	err = mgNoErr;
 	int		actCount;
 #elif Win32
@@ -1080,19 +1078,7 @@
 	if (0 == ioRefNum)
 		return mgArgErr;
 #if MacOSX
-	err = FMRead(ioRefNum, (int32*)&inCount, buffer);
-	if (outCount)
-	{
-		if (err && err != eofErr)
-		{
-			*outCount = 0L;
-		}
-		else
-		{
-			*outCount = inCount;
-		}
-	}
-	return OSErrToLVErr(err);
+	return FMRead(ioRefNum, inCount, (int32*)&outCount, buffer);
 #elif Unix
 	errno = 0;
 	actCount = fread((char *)buffer, 1, inCount, ioRefNum);
@@ -1133,9 +1119,7 @@
 
 static MgErr lvfile_Write(FileRefNum ioRefNum, uInt32 inCount, uInt32 *outCount, UPtr buffer)
 {
-#if MacOSX
-	OSErr err;
-#elif Unix || Win32
+#if Unix || Win32
 	MgErr err = mgNoErr;
 	int actCount;
 #endif
@@ -1143,19 +1127,7 @@
 	if (0 == ioRefNum)
 		return mgArgErr;
 #if MacOSX
-	err = FMWrite(ioRefNum, (int32*)&inCount, buffer);
-	if (outCount)
-	{
-		if (err && err != dskFulErr)
-		{
-			*outCount = 0L;
-		}
-		else
-		{
-			*outCount = inCount;
-		}
-	}
-	return OSErrToLVErr(err);
+	return FMWrite(ioRefNum, inCount, (int32*)outCount, buffer);
 #elif Win32
 	if (!WriteFile(ioRefNum, buffer, inCount, &actCount, NULL))
 		err = Win32ToLVFileErr();

Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h	2015-05-01 20:27:03 UTC (rev 1511)
+++ trunk/lvzip/c_source/lvutil.h	2015-05-01 20:41:54 UTC (rev 1512)
@@ -528,6 +528,8 @@
 MgErr FGetInfo64(ConstPath path, FInfo64Ptr infop, FGetInfoWhich which);
 MgErr FSetInfo(ConstPath path, FInfoPtr infop);
 MgErr FSetInfo64(ConstPath path, FInfo64Ptr infop);
+MgErr FMRead(File fd, int32 inCount, int32* outCount, UPtr buffer);
+MgErr FMWrite(File fd, int32 inCount, int32* outCount, UPtr buffer);
 
 int32 DbgPrintf(CStr fmt, ...);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.