← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/logging.cc

Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/logging.cc
25
25
{
26
26
  logging_t *p;
27
27
 
28
 
  p= (logging_t *) malloc(sizeof(logging_t));
 
28
  p= new logging_t;
29
29
  if (p == NULL) return 1;
30
30
  memset(p, 0, sizeof(logging_t));
31
31
 
45
45
  return 0;
46
46
 
47
47
err:
48
 
  free(p);
 
48
  delete p;
49
49
  return 1;
50
50
}
51
51
 
64
64
    }
65
65
  }
66
66
 
67
 
  if (p) free(p);
 
67
  if (p) delete p;
68
68
 
69
69
  return 0;
70
70
}