diff options
author | Daniel Lange <DLange@git.local> | 2020-10-20 10:23:47 +0200 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2020-10-20 10:23:47 +0200 |
commit | 0ea18a6edbbf97c7bab21bb2aab40cf8213858e3 (patch) | |
tree | 2a59ddc7ac580630f8d7088664b08b99f0761852 /Settings.c | |
parent | 9f1a9ab2c2d5984887f5b821afd34a8480790877 (diff) | |
parent | 4c66eb6d4cbdddc658e5f0274d8130155c6013f1 (diff) |
Merge branch 'Xalloc_Cleanup' of cgzones/htop
Diffstat (limited to 'Settings.c')
-rw-r--r-- | Settings.c | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -31,16 +31,14 @@ void Settings_delete(Settings* this) { static void Settings_readMeters(Settings* this, char* line, int column) { char* trim = String_trim(line); - int nIds; - char** ids = String_split(trim, ' ', &nIds); + char** ids = String_split(trim, ' ', NULL); free(trim); this->columns[column].names = ids; } static void Settings_readMeterModes(Settings* this, char* line, int column) { char* trim = String_trim(line); - int nIds; - char** ids = String_split(trim, ' ', &nIds); + char** ids = String_split(trim, ' ', NULL); free(trim); int len = 0; for (int i = 0; ids[i]; i++) { @@ -94,8 +92,7 @@ static void Settings_defaultMeters(Settings* this, int initialCpuCount) { static void readFields(ProcessField* fields, int* flags, const char* line) { char* trim = String_trim(line); - int nIds; - char** ids = String_split(trim, ' ', &nIds); + char** ids = String_split(trim, ' ', NULL); free(trim); int i, j; *flags = 0; @@ -126,7 +123,7 @@ static bool Settings_read(Settings* this, const char* fileName, int initialCpuCo if (!line) { break; } - int nOptions; + size_t nOptions; char** option = String_split(line, '=', &nOptions); free (line); if (nOptions < 2) { |