Commit 8e3051e6 authored by marko's avatar marko

branches/zip: mem_heap_cat(): Unused, remove.

parent 2fcd99e7
...@@ -312,19 +312,6 @@ mem_heap_dup( ...@@ -312,19 +312,6 @@ mem_heap_dup(
const void* data, /*!< in: data to be copied */ const void* data, /*!< in: data to be copied */
ulint len); /*!< in: length of data, in bytes */ 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 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 formatted string from the given heap. This supports a very limited set of
......
...@@ -125,27 +125,6 @@ mem_heap_dup( ...@@ -125,27 +125,6 @@ mem_heap_dup(
return(memcpy(mem_heap_alloc(heap, len), data, len)); 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. Concatenate two strings and return the result, using a memory heap.
@return own: the result */ @return own: the result */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment