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

Remove redundant null checks on Settings_write (covscan) 

Coverity scan reports that there is dead code in Settings_write
checking for nulls that have already been dereferenced on every
code path leading to the check.  This is likely a hangover from
times when the screens pointer was only conditionally allocated
- they're not needed anymore.
This commit is contained in:
Nathan Scott 2022-04-30 13:55:56 +10:00
parent cb61865bb9
commit cde72dd0b0
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Settings.c
View File

@ -631,19 +631,17 @@ int Settings_write(const Settings* this, bool onCrash) {
printSettingInteger("tree_view_always_by_pid", this->screens[0]->treeViewAlwaysByPID); printSettingInteger("tree_view_always_by_pid", this->screens[0]->treeViewAlwaysByPID);
printSettingInteger("all_branches_collapsed", this->screens[0]->allBranchesCollapsed); printSettingInteger("all_branches_collapsed", this->screens[0]->allBranchesCollapsed);
if (this->screens && this->screens[0]) { for (unsigned int i = 0; i < this->nScreens; i++) {
for (unsigned int i = 0; i < this->nScreens; i++) { ScreenSettings* ss = this->screens[i];
ScreenSettings* ss = this->screens[i]; fprintf(fd, "screen:%s=", ss->name);
fprintf(fd, "screen:%s=", ss->name); writeFields(fd, ss->fields, this->dynamicColumns, true, separator);
writeFields(fd, ss->fields, this->dynamicColumns, true, separator); printSettingString(".sort_key", toFieldName(this->dynamicColumns, ss->sortKey));
printSettingString(".sort_key", toFieldName(this->dynamicColumns, ss->sortKey)); printSettingString(".tree_sort_key", toFieldName(this->dynamicColumns, ss->treeSortKey));
printSettingString(".tree_sort_key", toFieldName(this->dynamicColumns, ss->treeSortKey)); printSettingInteger(".tree_view", ss->treeView);
printSettingInteger(".tree_view", ss->treeView); printSettingInteger(".tree_view_always_by_pid", ss->treeViewAlwaysByPID);
printSettingInteger(".tree_view_always_by_pid", ss->treeViewAlwaysByPID); printSettingInteger(".sort_direction", ss->direction);
printSettingInteger(".sort_direction", ss->direction); printSettingInteger(".tree_sort_direction", ss->treeDirection);
printSettingInteger(".tree_sort_direction", ss->treeDirection); printSettingInteger(".all_branches_collapsed", ss->allBranchesCollapsed);
printSettingInteger(".all_branches_collapsed", ss->allBranchesCollapsed);
}
} }
#undef printSettingString #undef printSettingString