← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-187

« back to all changes in this revision

Viewing changes to plugin/myisam/sort.cc

  • Committer: Mark Atwood
  • Date: 2011-06-30 07:03:08 UTC
  • mto: This revision was merged to the branch mainline in revision 2358.
  • Revision ID: me@mark.atwood.name-20110630070308-4380q6dqkkqv92w2
fix cppcheck redundantIfDelete0 warnings.  It is safe to deallocate a NULL pointer

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/sort.cc
227
227
  error =0;
228
228
 
229
229
err:
230
 
  if (sort_keys)
231
 
    free((unsigned char*) sort_keys);
 
230
  free(sort_keys);
232
231
  delete_dynamic(&buffpek);
233
232
  tempfile.close_cached_file();
234
233
  tempfile_for_exceptions.close_cached_file();
309
308
    {
310
309
      got_error=1;
311
310
      void * rec_buff_ptr= mi_get_rec_buff_ptr(info, sinfo->rec_buff);
312
 
      if (rec_buff_ptr != NULL)
313
 
        free(rec_buff_ptr);
 
311
      free(rec_buff_ptr);
314
312
      continue;
315
313
    }
316
314
    if (!got_error)
334
332
    }
335
333
    free((unsigned char*) sinfo->sort_keys);
336
334
    void * rec_buff_ptr= mi_get_rec_buff_ptr(info, sinfo->rec_buff);
337
 
    if (rec_buff_ptr != NULL)
338
 
      free(rec_buff_ptr);
 
335
    free(rec_buff_ptr);
339
336
    sinfo->sort_keys=0;
340
337
  }
341
338