← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/drizzle.cc

  • Committer: Mark Atwood
  • Date: 2011-12-16 15:35:52 UTC
  • mfrom: (2472.1.1 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111216153552-0zk0mmf1tt22p92n
merge lp:~brianaker/drizzle/libdrizzle-valgrind-test-warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/drizzle.cc
1
 
/*
 
1
/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
 
2
 *
2
3
 * Drizzle Client & Protocol Library
3
4
 *
4
5
 * Copyright (C) 2008 Eric Day (eday@oddments.org)
178
179
  free(drizzle->pfds);
179
180
 
180
181
  if (drizzle->options & DRIZZLE_ALLOCATED)
181
 
    free(drizzle);
 
182
  {
 
183
    delete drizzle;
 
184
  }
182
185
#if defined(_WIN32)
183
186
  /* if it is MS windows, invoke WSACleanup() at the end*/
184
187
  WSACleanup();
406
409
  con->drizzle->con_count--;
407
410
 
408
411
  if (con->options & DRIZZLE_CON_ALLOCATED)
409
 
    free(con);
 
412
  {
 
413
    delete con;
 
414
  }
410
415
}
411
416
 
412
417
void drizzle_con_free_all(drizzle_st *drizzle)