← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to examples/server.cc

  • Committer: Mark Atwood
  • Date: 2011-07-03 16:14:16 UTC
  • mfrom: (2353.3.1 drizzle)
  • Revision ID: me@mark.atwood.name-20110703161416-qho1b6h299v1w6i6
merge lp:~fallenpegasus/drizzle/fix-cppcheck-redundantIfDelete

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/server.cc
232
232
  while (1)
233
233
  {
234
234
    drizzle_result_free(result);
235
 
    if (data != NULL)
236
 
      free(data);
 
235
    free(data);
237
236
 
238
237
    data= (uint8_t *)drizzle_con_command_buffer(con, &command, &total, &ret);
239
238
    if (ret == DRIZZLE_RETURN_LOST_CONNECTION ||
240
239
        (ret == DRIZZLE_RETURN_OK && command == DRIZZLE_COMMAND_QUIT))
241
240
    {
242
 
      if (data != NULL)
243
 
        free(data);
 
241
      free(data);
244
242
      return;
245
243
    }
246
244
    DRIZZLE_RETURN_CHECK(ret, "drizzle_con_command_buffer", drizzle)