summaryrefslogtreecommitdiffstats
path: root/Settings.c
diff options
context:
space:
mode:
authorChristian Göttsche <cgzones@googlemail.com>2020-10-03 21:20:43 +0200
committerChristian Göttsche <cgzones@googlemail.com>2020-10-19 15:38:45 +0200
commit4c66eb6d4cbdddc658e5f0274d8130155c6013f1 (patch)
tree8446343e944911b68b590a4bb5f834476f13230b /Settings.c
parent577416d1a946382ab9f0c523e5fae755f9d71f69 (diff)
XUtils string related updates
- allow count out-parameter of String_split() to be NULL - introduce xStrndup() - do not allow NULL pointers passed to String_eq() it is not used in any code - implement String_startsWith(), String_contains_i() and String_eq() as inline header functions - adjust several conversion issues
Diffstat (limited to 'Settings.c')
-rw-r--r--Settings.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/Settings.c b/Settings.c
index ac8321a0..879d14fb 100644
--- a/Settings.c
+++ b/Settings.c
@@ -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) {

© 2014-2024 Faster IT GmbH | imprint | privacy policy