summaryrefslogtreecommitdiff
path: root/mysys/my_malloc.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-07-10 20:21:18 +0200
committerSergei Golubchik <sergii@pisem.net>2011-07-10 20:21:18 +0200
commite44fefc7b395279b9682321f952490ab9d1d01f0 (patch)
tree620b90cde4a5c1e05c8225eea14363d737b15c48 /mysys/my_malloc.c
parent49501b4ccb923475f259cccf66b90e8c6a5ed0ee (diff)
downloadmariadb-git-e44fefc7b395279b9682321f952490ab9d1d01f0.tar.gz
adding DBUG_ENTER/DBUG_RETURN tags that were useful when fixing memory leaks
Diffstat (limited to 'mysys/my_malloc.c')
-rw-r--r--mysys/my_malloc.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index c1bfb89c1fd..2555c052fc3 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -115,9 +115,11 @@ void my_free(void *ptr)
void *my_memdup(const void *from, size_t length, myf my_flags)
{
void *ptr;
+ DBUG_ENTER("my_memdup");
+
if ((ptr= my_malloc(length,my_flags)) != 0)
memcpy(ptr, from, length);
- return ptr;
+ DBUG_RETURN(ptr);
}
@@ -125,20 +127,24 @@ char *my_strdup(const char *from, myf my_flags)
{
char *ptr;
size_t length= strlen(from)+1;
+ DBUG_ENTER("my_strdup");
+
if ((ptr= (char*) my_malloc(length, my_flags)))
memcpy(ptr, from, length);
- return ptr;
+ DBUG_RETURN(ptr);
}
char *my_strndup(const char *from, size_t length, myf my_flags)
{
char *ptr;
+ DBUG_ENTER("my_strndup");
+
if ((ptr= (char*) my_malloc(length+1, my_flags)))
{
memcpy(ptr, from, length);
ptr[length]= 0;
}
- return ptr;
+ DBUG_RETURN(ptr);
}