From 0b3a733ebe9725c54252a7f3db5067fc1df392b5 Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 30 Jun 2009 10:56:36 +0000 Subject: [PATCH] branches/zip: mem_heap_cat(): Unused, remove. --- include/mem0mem.h | 13 ------------- mem/mem0mem.c | 21 --------------------- 2 files changed, 34 deletions(-) diff --git a/include/mem0mem.h b/include/mem0mem.h index f52e1093363..a092b024219 100644 --- a/include/mem0mem.h +++ b/include/mem0mem.h @@ -312,19 +312,6 @@ mem_heap_dup( const void* data, /*!< in: data to be copied */ ulint len); /*!< in: length of data, in bytes */ -/**********************************************************************//** -Concatenate two memory blocks and return the result, using a memory heap. -@return own: the result */ -UNIV_INTERN -void* -mem_heap_cat( -/*=========*/ - mem_heap_t* heap, /*!< in: memory heap where result is allocated */ - const void* b1, /*!< in: block 1 */ - ulint len1, /*!< in: length of b1, in bytes */ - const void* b2, /*!< in: block 2 */ - ulint len2); /*!< in: length of b2, in bytes */ - /****************************************************************//** A simple (s)printf replacement that dynamically allocates the space for the formatted string from the given heap. This supports a very limited set of diff --git a/mem/mem0mem.c b/mem/mem0mem.c index e60e6809d15..e0dc8716f13 100644 --- a/mem/mem0mem.c +++ b/mem/mem0mem.c @@ -125,27 +125,6 @@ mem_heap_dup( return(memcpy(mem_heap_alloc(heap, len), data, len)); } -/**********************************************************************//** -Concatenate two memory blocks and return the result, using a memory heap. -@return own: the result */ -UNIV_INTERN -void* -mem_heap_cat( -/*=========*/ - mem_heap_t* heap, /*!< in: memory heap where result is allocated */ - const void* b1, /*!< in: block 1 */ - ulint len1, /*!< in: length of b1, in bytes */ - const void* b2, /*!< in: block 2 */ - ulint len2) /*!< in: length of b2, in bytes */ -{ - void* res = mem_heap_alloc(heap, len1 + len2); - - memcpy(res, b1, len1); - memcpy((char*)res + len1, b2, len2); - - return(res); -} - /**********************************************************************//** Concatenate two strings and return the result, using a memory heap. @return own: the result */