Mercurial > hg > dmlib
diff src/dmpack.c @ 1046:7e54b2d08ce7
Add special debug error message function/macro that can be
disabled and compiled out.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 01 Mar 2015 18:03:08 +0200 |
parents | d674ddc0fc82 |
children | e06abfde6c39 |
line wrap: on
line diff
--- a/src/dmpack.c Sun Mar 01 17:47:50 2015 +0200 +++ b/src/dmpack.c Sun Mar 01 18:03:08 2015 +0200 @@ -78,27 +78,32 @@ // Allocate packfile-structure if ((pack = dmMalloc0(sizeof(DMPackFile))) == NULL) { - ret = DMERR_MALLOC; + ret = dmErrorDBG(DMERR_MALLOC, + "Failed to allocate memory for PACK file structure '%s'.\n", + filename); goto out; } // Open the file if ((pack->file = fopen(filename, readOnly ? "rb" : "r+b")) == NULL) { - ret = DMERR_FOPEN; + ret = dmErrorDBG(dmGetErrno(), + "Failed to open PACK file '%s'.\n", + filename); goto out; } pack->filename = dm_strdup(filename); // Read PACK header - fseek(pack->file, 0L, SEEK_SET); + DM_FSEEK64(pack->file, 0L, SEEK_SET); if (!dm_fread_str(pack->file, (Uint8 *) &hdr.ident, sizeof(hdr.ident)) || !dm_fread_le16(pack->file, &hdr.version) || !dm_fread_le32(pack->file, &hdr.dirEntries) || !dm_fread_le64(pack->file, &hdr.dirOffset)) { - ret = DMERR_FREAD; + ret = dmErrorDBG(DMERR_FREAD, + "Error reading PACK file header data.\n"); goto out; } @@ -117,9 +122,11 @@ // Read directory if (hdr.dirOffset < sizeof(hdr) || - fseek(pack->file, hdr.dirOffset, SEEK_SET) != 0) + DM_FSEEK64(pack->file, hdr.dirOffset, SEEK_SET) != 0) { - ret = DMERR_INVALID; + ret = dmErrorDBG(DMERR_INVALID, + "Error seeking to PACK file '%s' directory offset.\n", + filename); goto out; }