comparison tools/packed.c @ 2391:d1992206765a

Fix some format specifiers, was erraneously using DM_PRI*_SIZE_T instead of DM_PRI*64.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 09 Jan 2020 20:47:33 +0200
parents 36edd316184a
children b7cd5dd0b82e
comparison
equal deleted inserted replaced
2390:88be5cf55caf 2391:d1992206765a
234 { 234 {
235 hdr.dirEntries++; 235 hdr.dirEntries++;
236 hdr.dirOffset += node->length; 236 hdr.dirOffset += node->length;
237 } 237 }
238 238
239 dmMsg(1, "%d entries in PACK, dir at offset 0x%08" DM_PRIx_SIZE_T ".\n", 239 dmMsg(1, "%d entries in PACK, dir at offset 0x%08" DM_PRIx64 ".\n",
240 hdr.dirEntries, hdr.dirOffset); 240 hdr.dirEntries, hdr.dirOffset);
241 241
242 // Write PACK header 242 // Write PACK header
243 if (fseeko(pack->file, 0, SEEK_SET) != 0) 243 if (fseeko(pack->file, 0, SEEK_SET) != 0)
244 return DMERR_FSEEK; 244 return DMERR_FSEEK;
706 dmPrint(1, "%-32s [ERROR:%d]\n", 706 dmPrint(1, "%-32s [ERROR:%d]\n",
707 srcFilenames[i], res); 707 srcFilenames[i], res);
708 } 708 }
709 else 709 else
710 { 710 {
711 dmPrint(1, "%-32s ['%s', s=%d, c=%d, o=%ld, f=0x%04x]\n", 711 dmPrint(1, "%-32s ['%s', s=%d, c=%d, o=%" DM_PRId64 ", f=0x%04x]\n",
712 srcFilenames[i], node->filename, 712 srcFilenames[i], node->filename,
713 node->size, node->length, node->offset, node->flags); 713 node->size, node->length, node->offset, node->flags);
714 } 714 }
715 } 715 }
716 716
754 // No filenames specified, everything shown 754 // No filenames specified, everything shown
755 match = TRUE; 755 match = TRUE;
756 756
757 if (match) 757 if (match)
758 { 758 {
759 dmPrint(0, "%-32s | %8d | %8d | %08" DM_PRIx_SIZE_T " | %04x\n", 759 dmPrint(0, "%-32s | %8d | %8d | %08" DM_PRIx64 " | %04x\n",
760 node->filename, node->size, node->length, 760 node->filename, node->size, node->length,
761 node->offset, node->flags); 761 node->offset, node->flags);
762 } 762 }
763 } 763 }
764 764
807 { 807 {
808 // Mark as done 808 // Mark as done
809 node->privFlags |= PACK_EXTRACTED; 809 node->privFlags |= PACK_EXTRACTED;
810 810
811 // Print one entry 811 // Print one entry
812 dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08" DM_PRIx_SIZE_T ", flags=0x%04x]\n", 812 dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08" DM_PRIx64 ", flags=0x%04x]\n",
813 node->filename, node->size, node->length, 813 node->filename, node->size, node->length,
814 node->offset, node->flags); 814 node->offset, node->flags);
815 815
816 dmPackExtractFile(pack, node, optDoCompress); 816 dmPackExtractFile(pack, node, optDoCompress);
817 } 817 }