[opengtoolkit-cvs] lvzip/c_source iomem.c, 1.7, 1.8 lvutil.c, 1.2, 1.3 lvutil.h, 1.1, 1.2

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

Update of /cvsroot/opengtoolkit/lvzip/c_source
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29871

Modified Files:
	iomem.c lvutil.c lvutil.h 
Log Message:
Removed some LabWindows CVI warnings

Index: lvutil.h
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lvutil.h	17 Sep 2007 16:13:02 -0000	1.1
--- lvutil.h	6 Dec 2007 18:55:01 -0000	1.2
***************
*** 27,31 ****
  #elif defined(WIN32) || defined(_WIN32)  || defined(__WIN32__) || defined(_WIN32_WCE)
   #define Win32 1
!  #ifdef _DEBUG
    #define DEBUG 1
   #endif
--- 27,31 ----
  #elif defined(WIN32) || defined(_WIN32)  || defined(__WIN32__) || defined(_WIN32_WCE)
   #define Win32 1
!  #if defined(_DEBUG) || defined(_CVI_DEBUG_)
    #define DEBUG 1
   #endif

Index: iomem.c
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** iomem.c	17 Sep 2007 17:22:06 -0000	1.7
--- iomem.c	6 Dec 2007 18:55:01 -0000	1.8
***************
*** 104,108 ****
              return err;
  
!         if (err = NumericArrayResize(uB, 1, (UHandle*)&handle, Max(10000, (offset + size) << 1)))
              return err;
      }
--- 104,109 ----
              return err;
  
!         err = NumericArrayResize(uB, 1, (UHandle*)&handle, Max(10000, (offset + size) << 1));
! 		if (err)
              return err;
      }

Index: lvutil.c
===================================================================
RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lvutil.c	18 Sep 2007 04:50:19 -0000	1.2
--- lvutil.c	6 Dec 2007 18:55:01 -0000	1.3
***************
*** 33,36 ****
--- 33,39 ----
  #elif Win32
  #include "iowin32.h"
+ #ifndef INVALID_FILE_ATTRIBUTES
+ #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+ #endif
  #endif
  
***************
*** 577,581 ****
  	}
  
! 	if (err = MakePathDSString(path, &lstr))
  	  return err;
  	/* Open the specified file. */
--- 580,585 ----
  	}
  
! 	err = MakePathDSString(path, &lstr);
! 	if (err)
  	  return err;
  	/* Open the specified file. */
***************
*** 816,820 ****
  	}
  #elif Win32
! 	if (err = MakePathDSString(path, &lstr))
  	  return err;
  
--- 820,825 ----
  	}
  #elif Win32
! 	err = MakePathDSString(path, &lstr);
! 	if (err)
  	  return err;
  
***************
*** 874,878 ****
  	      err = FPathToPath(&temp);
  	      if (!err)
! 	        err = FAppendName(temp, "\003*.*");
  
  	      err = MakePathDSString(temp, &lstr);
--- 879,883 ----
  	      err = FPathToPath(&temp);
  	      if (!err)
! 	        err = FAppendName(temp, (PStr)"\003*.*");
  
  	      err = MakePathDSString(temp, &lstr);