[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/physfs/archivers grp.c,1.1.1.1.6.7,1.1.1
From: |
Alexander Pipelka <address@hidden> |
Subject: |
[paragui-cvs] CVS: paragui/src/physfs/archivers grp.c,1.1.1.1.6.7,1.1.1.1.6.8 zip.c,1.1.1.1.6.9,1.1.1.1.6.10 |
Date: |
Mon, 27 Jan 2003 08:39:17 -0500 |
Update of /cvsroot/paragui/paragui/src/physfs/archivers
In directory subversions:/tmp/cvs-serv26883/src/physfs/archivers
Modified Files:
Tag: devel-1-0
grp.c zip.c
Log Message:
win32 compilation fixes
Index: grp.c
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/archivers/grp.c,v
retrieving revision 1.1.1.1.6.7
retrieving revision 1.1.1.1.6.8
diff -C2 -r1.1.1.1.6.7 -r1.1.1.1.6.8
*** grp.c 3 Jan 2003 09:53:04 -0000 1.1.1.1.6.7
--- grp.c 27 Jan 2003 13:39:08 -0000 1.1.1.1.6.8
***************
*** 317,323 ****
} /* if */
! entry->size = PHYSFS_swapULE32(entry->size);
entry->startPos = location;
! location += entry->size;
} /* for */
--- 317,323 ----
} /* if */
! entry->size = PHYSFS_swapULE32((unsigned int)entry->size);
entry->startPos = location;
! location += (unsigned int)entry->size;
} /* for */
Index: zip.c
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/archivers/zip.c,v
retrieving revision 1.1.1.1.6.9
retrieving revision 1.1.1.1.6.10
diff -C2 -r1.1.1.1.6.9 -r1.1.1.1.6.10
*** zip.c 3 Jan 2003 09:53:04 -0000 1.1.1.1.6.9
--- zip.c 27 Jan 2003 13:39:08 -0000 1.1.1.1.6.10
***************
*** 251,255 ****
{
maxread = avail - (avail % objSize);
! objCount = maxread / objSize;
BAIL_IF_MACRO(objCount == 0, ERR_PAST_EOF, 0); /* quick rejection. */
__PHYSFS_setError(ERR_PAST_EOF); /* this is always true here. */
--- 251,255 ----
{
maxread = avail - (avail % objSize);
! objCount = (PHYSFS_uint32)maxread / objSize;
BAIL_IF_MACRO(objCount == 0, ERR_PAST_EOF, 0); /* quick rejection. */
__PHYSFS_setError(ERR_PAST_EOF); /* this is always true here. */
***************
*** 283,293 ****
br = __PHYSFS_platformRead(finfo->handle,
finfo->buffer,
! 1, br);
if (br <= 0)
break;
! finfo->compressed_position += br;
finfo->stream.next_in = finfo->buffer;
! finfo->stream.avail_in = br;
} /* if */
} /* if */
--- 283,293 ----
br = __PHYSFS_platformRead(finfo->handle,
finfo->buffer,
! 1, (PHYSFS_uint32)br);
if (br <= 0)
break;
! finfo->compressed_position += (PHYSFS_uint32)br;
finfo->stream.next_in = finfo->buffer;
! finfo->stream.avail_in = (PHYSFS_uint32)br;
} /* if */
} /* if */
***************
*** 304,308 ****
if (retval > 0)
! finfo->uncompressed_position += (retval * objSize);
return(retval);
--- 304,308 ----
if (retval > 0)
! finfo->uncompressed_position += (PHYSFS_uint32)(retval * objSize);
return(retval);
***************
*** 342,346 ****
PHYSFS_sint64 newpos = offset + entry->offset;
BAIL_IF_MACRO(!__PHYSFS_platformSeek(in, newpos), NULL, 0);
! finfo->uncompressed_position = newpos;
} /* if */
--- 342,346 ----
PHYSFS_sint64 newpos = offset + entry->offset;
BAIL_IF_MACRO(!__PHYSFS_platformSeek(in, newpos), NULL, 0);
! finfo->uncompressed_position = (PHYSFS_uint32)newpos;
} /* if */
***************
*** 372,376 ****
{
PHYSFS_uint8 buf[512];
! PHYSFS_uint32 maxread = offset - finfo->uncompressed_position;
if (maxread > sizeof (buf))
maxread = sizeof (buf);
--- 372,376 ----
{
PHYSFS_uint8 buf[512];
! PHYSFS_uint32 maxread = (PHYSFS_uint32)offset -
finfo->uncompressed_position;
if (maxread > sizeof (buf))
maxread = sizeof (buf);
***************
*** 443,447 ****
{
filepos = 0;
! maxread = filelen;
} /* else */
--- 443,447 ----
{
filepos = 0;
! maxread = (PHYSFS_uint32)filelen;
} /* else */
***************
*** 1061,1065 ****
* data is at the start of the physical file.
*/
! *data_start = pos - (*central_dir_ofs + ui32);
/* Now that we know the difference, fix up the central dir offset... */
--- 1061,1065 ----
* data is at the start of the physical file.
*/
! *data_start = (PHYSFS_uint32) pos - (*central_dir_ofs + ui32);
/* Now that we know the difference, fix up the central dir offset... */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/physfs/archivers grp.c,1.1.1.1.6.7,1.1.1.1.6.8 zip.c,1.1.1.1.6.9,1.1.1.1.6.10,
Alexander Pipelka <address@hidden> <=