← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_malloc.c

  • Committer: Jay Pipes
  • Date: 2008-07-17 21:15:06 UTC
  • mto: This revision was merged to the branch mainline in revision 182.
  • Revision ID: jay@mysql.com-20080717211506-1nntrb8v42ojjgdo
Phase 5 - Remove DBUG from mysys

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_malloc.c
22
22
void *my_malloc(size_t size, myf my_flags)
23
23
{
24
24
  void* point;
25
 
  DBUG_ENTER("my_malloc");
26
 
  DBUG_PRINT("my",("size: %lu  my_flags: %d", (ulong) size, my_flags));
27
25
 
28
26
  if (!size)
29
27
    size=1;                                     /* Safety */
39
37
  }
40
38
  else if (my_flags & MY_ZEROFILL)
41
39
    bzero(point,size);
42
 
  DBUG_PRINT("exit",("ptr: 0x%lx", (long) point));
43
 
  DBUG_RETURN((void*) point);
 
40
  return((void*) point);
44
41
} /* my_malloc */
45
42
 
46
43
 
49
46
 
50
47
void my_no_flags_free(void* ptr)
51
48
{
52
 
  DBUG_ENTER("my_free");
53
 
  DBUG_PRINT("my",("ptr: 0x%lx", (long) ptr));
54
49
  if (ptr)
55
50
    free(ptr);
56
 
  DBUG_VOID_RETURN;
 
51
  return;
57
52
} /* my_free */
58
53
 
59
54