Mercurial > hg > dmlib
diff tools/packed.c @ 2479:c1cae47cd410
Rename DMPackEntry::length to csize (compressed size).
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 27 Apr 2020 21:33:29 +0300 |
parents | d18fd4866650 |
children | c7a0913e1032 |
line wrap: on
line diff
--- a/tools/packed.c Mon Apr 27 20:39:35 2020 +0300 +++ b/tools/packed.c Mon Apr 27 21:33:29 2020 +0300 @@ -215,7 +215,7 @@ node->size = src->size; node->offset = src->offset; - node->length = src->length; + node->csize = src->csize; node->flags = src->flags; return node; @@ -244,7 +244,7 @@ for (node = pack->entries; node != NULL; node = node->next) { hdr.dirEntries++; - hdr.dirOffset += node->length; + hdr.dirOffset += node->csize; } dmMsg(1, "%d entries in PACK, dir at offset 0x%08" DM_PRIx64 ".\n", @@ -269,7 +269,7 @@ // Write one entry if (!dm_fwrite_str(pack->file, node->filename, DMRES_NAME_LEN) || !dm_fwrite_le64(pack->file, node->offset) || - !dm_fwrite_le32(pack->file, node->length) || + !dm_fwrite_le32(pack->file, node->csize) || !dm_fwrite_le32(pack->file, node->size) || !dm_fwrite_le32(pack->file, node->flags)) return DMERR_FWRITE; @@ -326,7 +326,7 @@ startOffs = sizeof(DMPackFileHeader); for (node = pack->entries; node != NULL; node = node->next) { - startOffs += node->length; + startOffs += node->csize; } // Seek to the position @@ -404,7 +404,7 @@ entry.filename[DMRES_NAME_LEN] = 0; entry.offset = startOffs; entry.size = zstr.total_in; - entry.length = outSize; + entry.csize = outSize; entry.flags = flags | (compress ? DMF_COMPRESSED : 0); // Add directory entry @@ -477,7 +477,7 @@ zinit = TRUE; } - remaining = entry->length; + remaining = entry->csize; zret = Z_OK; while (remaining > 0 && zret == Z_OK) { @@ -721,7 +721,7 @@ { dmPrint(1, "%-32s ['%s', s=%d, c=%d, o=%" DM_PRId64 ", f=0x%04x]\n", srcFilenames[i], node->filename, - node->size, node->length, node->offset, node->flags); + node->size, node->csize, node->offset, node->flags); } } @@ -768,7 +768,7 @@ if (match) { dmPrint(0, "%-32s | %8d | %8d | %08" DM_PRIx64 " | %04x\n", - node->filename, node->size, node->length, + node->filename, node->size, node->csize, node->offset, node->flags); } } @@ -821,7 +821,7 @@ // Print one entry dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08" DM_PRIx64 ", flags=0x%04x]\n", - node->filename, node->size, node->length, + node->filename, node->size, node->csize, node->offset, node->flags); dmPackExtractFile(pack, node, optDoCompress);