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

Settings_write: fix return value on error 

Return a negative errno on fprintf() or flcose() failure, not a return
value of ferror() or flcose().
This commit is contained in:
Christian Göttsche 2021-03-13 18:15:20 +01:00
parent 23797e730e
commit 1275139795
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Settings.c
View File

@ -333,9 +333,15 @@ int Settings_write(const Settings* this) {
fprintf(fd, "topology_affinity=%d\n", (int) this->topologyAffinity); fprintf(fd, "topology_affinity=%d\n", (int) this->topologyAffinity);
#endif #endif
int r1 = ferror(fd); int r = 0;
int r2 = fclose(fd);
return r1 ? r1 : r2; if (ferror(fd) != 0)
r = (errno != 0) ? -errno : -EBADF;
if (fclose(fd) != 0)
r = r ? r : -errno;
return r;
} }
Settings* Settings_new(int initialCpuCount) { Settings* Settings_new(int initialCpuCount) {