From 6783cf4c8ecda3cb29f86306af2df1426b6cc910 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 14 Feb 2010 12:46:25 +0200 Subject: [PATCH] directory: use block_heap_Alloc() --- modules/access/directory.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/modules/access/directory.c b/modules/access/directory.c index a5562cea4f..aeb78b3d43 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -244,14 +244,12 @@ block_t *DirBlock (access_t *p_access) "%s" \ " \n" \ "\n", p_sys->psz_xspf_extension ); - if( len < 0 ) + if (unlikely(len == -1)) goto fatal; - block_t *block = block_Alloc ( len ); - if (!block) - goto fatal; - memcpy (block->p_buffer, footer, len); - free( footer ); + block_t *block = block_heap_Alloc (footer, footer, len); + if (unlikely(block == NULL)) + free (footer); p_access->info.b_eof = true; return block; } @@ -393,15 +391,12 @@ block_t *DirBlock (access_t *p_access) goto fatal; free( old_xspf_extension ); - /* TODO: new block allocator for malloc()ated data */ - block_t *block = block_Alloc (len); - if (!block) + block_t *block = block_heap_Alloc (entry, entry, len); + if (unlikely(block == NULL)) { free (entry); goto fatal; } - memcpy (block->p_buffer, entry, len); - free (entry); return block; fatal: -- 2.39.2