← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/memory/multi_malloc.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/memory/multi_malloc.cc
22
22
#include <drizzled/memory/multi_malloc.h>
23
23
#include <drizzled/definitions.h>
24
24
 
25
 
namespace drizzled
26
 
{
27
 
namespace memory
28
 
{
 
25
namespace drizzled {
 
26
namespace memory {
 
27
 
29
28
/*
30
29
  Malloc many pointers at the same time
31
30
  Only ptr1 can be free'd, and doing this will free all
65
64
  if (!(start= calloc(0, tot_length)))
66
65
    return(0);
67
66
#else
68
 
  if (!(start= malloc(tot_length)))
69
 
    return(0);
 
67
  start= malloc(tot_length);
70
68
  if (zerofill)
71
69
    memset(start, 0, tot_length);
72
70
#endif