zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #500 from Explorer09/meter-tweaks 

Remove redundant is-null checks on free(Meter.drawData)
This commit is contained in:
Hisham Muhammad 2016-05-27 16:30:45 -03:00
parent fa0c637c55 313b3d3752
commit 3126cfce6c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Meter.c
View File

@ -181,8 +181,7 @@ void Meter_delete(Object* cast) {
if (Meter_doneFn(this)) { if (Meter_doneFn(this)) {
Meter_done(this); Meter_done(this);
} }
if (this->drawData) free(this->drawData);
free(this->drawData);
free(this->caption); free(this->caption);
free(this->values); free(this->values);
free(this); free(this);
@ -213,8 +212,7 @@ void Meter_setMode(Meter* this, int modeIndex) {
Meter_updateMode(this, modeIndex); Meter_updateMode(this, modeIndex);
} else { } else {
assert(modeIndex >= 1); assert(modeIndex >= 1);
if (this->drawData) free(this->drawData);
free(this->drawData);
this->drawData = NULL; this->drawData = NULL;
MeterMode* mode = Meter_modes[modeIndex]; MeterMode* mode = Meter_modes[modeIndex];