walkero
/
physfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patched to compile with C89 compilers.

This commit is contained in:
Ryan C. Gordon 2017-07-07 09:21:06 -04:00
parent 2bd8c33fe5
commit 9a19eba065
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/archiver_vdf.c
View File

@ -258,8 +258,9 @@ static PHYSFS_sint64 vdfDosTimeToEpoch(VdfTimestamp time)
*/ */
static void vdfTruncateFilename(char *s, PHYSFS_uint32 *nameLength) static void vdfTruncateFilename(char *s, PHYSFS_uint32 *nameLength)
{ {
s[VDF_ENTRY_NAME_LENGTH - 1] = '\0';
int i; int i;
s[VDF_ENTRY_NAME_LENGTH - 1] = '\0';
for (i = VDF_ENTRY_NAME_LENGTH - 2; i > 0; i--) { for (i = VDF_ENTRY_NAME_LENGTH - 2; i > 0; i--) {
if (isspace(s[i])) if (isspace(s[i]))
{ {
@ -322,23 +323,24 @@ static void vdfAddEntry(VdfRecord *record, VdfEntryInfo *entry)
static VdfRecord *vdfLoadRecord(PHYSFS_Io *io, VdfHeader header) static VdfRecord *vdfLoadRecord(PHYSFS_Io *io, VdfHeader header)
{ {
VdfRecord *record = (VdfRecord*)allocator.Malloc(sizeof(VdfRecord)); VdfRecord *record = (VdfRecord*)allocator.Malloc(sizeof(VdfRecord));
VdfEntryInfo *entries;
VdfEntryInfo *entry;
BAIL_IF(!record, PHYSFS_ERR_OUT_OF_MEMORY, NULL); BAIL_IF(!record, PHYSFS_ERR_OUT_OF_MEMORY, NULL);
VdfEntryInfo *entries = (VdfEntryInfo *)allocator.Malloc(sizeof(VdfEntryInfo) * header.numEntries); entries = (VdfEntryInfo *)allocator.Malloc(sizeof(VdfEntryInfo) * header.numEntries);
GOTO_IF(!entries, PHYSFS_ERR_OUT_OF_MEMORY, failed); GOTO_IF(!entries, PHYSFS_ERR_OUT_OF_MEMORY, failed);
if (!__PHYSFS_readAll(io, entries, sizeof(VdfEntryInfo) * header.numEntries)) goto failed; if (!__PHYSFS_readAll(io, entries, sizeof(VdfEntryInfo) * header.numEntries)) goto failed;
VdfEntryInfo *entry;
record->timestamp = vdfDosTimeToEpoch(header.timestamp); record->timestamp = vdfDosTimeToEpoch(header.timestamp);
record->numEntries = header.numEntries; record->numEntries = header.numEntries;
record->entries = entries; record->entries = entries;
memset(record->table, 0, sizeof(record->table)); memset(record->table, 0, sizeof(record->table));
PHYSFS_uint32 len;
for (entry = entries; header.numEntries > 0; header.numEntries--, entry++) for (entry = entries; header.numEntries > 0; header.numEntries--, entry++)
{ {
PHYSFS_uint32 len;
entry->jump = PHYSFS_swapULE32(entry->jump); entry->jump = PHYSFS_swapULE32(entry->jump);
entry->size = PHYSFS_swapULE32(entry->size); entry->size = PHYSFS_swapULE32(entry->size);
entry->type = PHYSFS_swapULE32(entry->type); entry->type = PHYSFS_swapULE32(entry->type);