From f13190914eeb3197f916f48832cd0f633265b906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Wed, 26 Dec 2012 13:03:22 +0000 Subject: [PATCH] removed some unnecessary checks (nw) --- src/lib/formats/tzx_cas.c | 6 +++--- src/mess/tools/imgtool/modules/fat.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/formats/tzx_cas.c b/src/lib/formats/tzx_cas.c index de59fbee26e..1f3278023dd 100644 --- a/src/lib/formats/tzx_cas.c +++ b/src/lib/formats/tzx_cas.c @@ -92,13 +92,13 @@ static void tzx_cas_get_blocks( const UINT8 *casdata, int caslen ) if (block_count == max_block_count) { - void *old_blocks = blocks; + void *old_blocks = blocks; int old_max_block_count = max_block_count; max_block_count = max_block_count + BLOCK_COUNT_INCREMENTS; blocks = (UINT8**)malloc(max_block_count * sizeof(UINT8*)); // SHOULD NOT BE USING auto_alloc_array() - memset(blocks,0,max_block_count); + memset(blocks, 0, max_block_count); memcpy(blocks, old_blocks, old_max_block_count * sizeof(UINT8*)); - if (blocks) free(old_blocks); + free(old_blocks); } blocks[block_count] = (UINT8*)&casdata[pos]; diff --git a/src/mess/tools/imgtool/modules/fat.c b/src/mess/tools/imgtool/modules/fat.c index e03a2d70601..90768a9a537 100644 --- a/src/mess/tools/imgtool/modules/fat.c +++ b/src/mess/tools/imgtool/modules/fat.c @@ -1559,7 +1559,7 @@ static imgtoolerr_t fat_construct_dirent(const char *filename, creation_policy_t /* the short filename suffices; remove the LFN stuff */ memcpy(created_entry, created_entry + created_entry_len - FAT_DIRENT_SIZE, FAT_DIRENT_SIZE); created_entry_len = FAT_DIRENT_SIZE; - if (created_entry) free(created_entry); + free(created_entry); new_created_entry = (UINT8 *) malloc(created_entry_len); if (!new_created_entry) {