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

Merge pull request #657 from kalbasit/remove_whitespace_from_config_file 

Settings: do not emit trailing whitespace
This commit is contained in:
Hisham Muhammad 2017-07-25 13:57:55 -03:00 committed by GitHub
parent e940aecfb9 ce0cf3c457
commit 33fda93271
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

@ -255,23 +255,29 @@ static bool Settings_read(Settings* this, const char* fileName) {
static void writeFields(FILE* fd, ProcessField* fields, const char* name) { static void writeFields(FILE* fd, ProcessField* fields, const char* name) {
fprintf(fd, "%s=", name); fprintf(fd, "%s=", name);
const char* sep = "";
for (int i = 0; fields[i]; i++) { for (int i = 0; fields[i]; i++) {
// This "-1" is for compatibility with the older enum format. // This "-1" is for compatibility with the older enum format.
fprintf(fd, "%d ", (int) fields[i]-1); fprintf(fd, "%s%d", sep, (int) fields[i]-1);
sep = " ";
} }
fprintf(fd, "\n"); fprintf(fd, "\n");
} }
static void writeMeters(Settings* this, FILE* fd, int column) { static void writeMeters(Settings* this, FILE* fd, int column) {
const char* sep = "";
for (int i = 0; i < this->columns[column].len; i++) { for (int i = 0; i < this->columns[column].len; i++) {
fprintf(fd, "%s ", this->columns[column].names[i]); fprintf(fd, "%s%s", sep, this->columns[column].names[i]);
sep = " ";
} }
fprintf(fd, "\n"); fprintf(fd, "\n");
} }
static void writeMeterModes(Settings* this, FILE* fd, int column) { static void writeMeterModes(Settings* this, FILE* fd, int column) {
const char* sep = "";
for (int i = 0; i < this->columns[column].len; i++) { for (int i = 0; i < this->columns[column].len; i++) {
fprintf(fd, "%d ", this->columns[column].modes[i]); fprintf(fd, "%s%d", sep, this->columns[column].modes[i]);
sep = " ";
} }
fprintf(fd, "\n"); fprintf(fd, "\n");
} }