[paragui-cvs] CVS: paragui/src/physfs physfs.c,1.1.1.1.6.1,1.1.1.1.6.2

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/physfs
In directory subversions:/tmp/cvs-serv24542/src/physfs

Modified Files:
      Tag: devel-1-0
        physfs.c 
Log Message:
adapted VC++ workspace
fixed PhysFS for Win32 (Ryan messed this up really badly)
compilation fixes



Index: physfs.c
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/physfs.c,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -C2 -r1.1.1.1.6.1 -r1.1.1.1.6.2
*** physfs.c    3 May 2002 10:15:33 -0000       1.1.1.1.6.1
--- physfs.c    29 May 2002 15:34:09 -0000      1.1.1.1.6.2
***************
*** 307,311 ****
          return(1);
  
!     ptr = realloc(*dir, strlen(*dir) + strlen(dirsep) + 1);
      if (!ptr)
      {
--- 307,311 ----
          return(1);
  
!     ptr = (char*)realloc(*dir, strlen(*dir) + strlen(dirsep) + 1);
      if (!ptr)
      {
***************
*** 421,425 ****
      {
          ptr = __PHYSFS_platformRealPath(userDir);
!         free(userDir);
          userDir = ptr;
      } /* if */
--- 421,425 ----
      {
          ptr = __PHYSFS_platformRealPath(userDir);
!         //free(userDir);
          userDir = ptr;
      } /* if */
***************
*** 717,721 ****
  
          /* set write dir... */
!     str = malloc(strlen(userdir) + (strlen(organization) * 2) +
                   (strlen(appName) * 2) + (strlen(dirsep) * 3) + 2);
      BAIL_IF_MACRO(str == NULL, ERR_OUT_OF_MEMORY, 0);
--- 717,721 ----
  
          /* set write dir... */
!     str = (char*)malloc(strlen(userdir) + (strlen(organization) * 2) +
                   (strlen(appName) * 2) + (strlen(dirsep) * 3) + 2);
      BAIL_IF_MACRO(str == NULL, ERR_OUT_OF_MEMORY, 0);
***************
*** 781,785 ****
                  {
                      const char *d = PHYSFS_getRealDir(*i);
!                     str = malloc(strlen(d) + strlen(dirsep) + l + 1);
                      if (str != NULL)
                      {
--- 781,785 ----
                  {
                      const char *d = PHYSFS_getRealDir(*i);
!                     str = (char*)malloc(strlen(d) + strlen(dirsep) + l + 1);
                      if (str != NULL)
                      {
***************
*** 883,887 ****
      char *str;
  
!     start = str = malloc(strlen(fname) + 1);
      BAIL_IF_MACRO(str == NULL, ERR_OUT_OF_MEMORY, 0);
      strcpy(str, fname);
--- 883,887 ----
      char *str;
  
!     start = str = (char*)malloc(strlen(fname) + 1);
      BAIL_IF_MACRO(str == NULL, ERR_OUT_OF_MEMORY, 0);
      strcpy(str, fname);
***************
*** 939,943 ****
      BAIL_IF_MACRO_MUTEX(!h->funcs->mkdir, ERR_NOT_SUPPORTED, stateLock, 0);
      BAIL_IF_MACRO_MUTEX(!__PHYSFS_verifySecurity(h, dname), NULL, stateLock, 
0);
!     start = str = malloc(strlen(dname) + 1);
      BAIL_IF_MACRO_MUTEX(str == NULL, ERR_OUT_OF_MEMORY, stateLock, 0);
      strcpy(str, dname);
--- 939,943 ----
      BAIL_IF_MACRO_MUTEX(!h->funcs->mkdir, ERR_NOT_SUPPORTED, stateLock, 0);
      BAIL_IF_MACRO_MUTEX(!__PHYSFS_verifySecurity(h, dname), NULL, stateLock, 
0);
!     start = str = (char*)malloc(strlen(dname) + 1);
      BAIL_IF_MACRO_MUTEX(str == NULL, ERR_OUT_OF_MEMORY, stateLock, 0);
      strcpy(str, dname);