aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-10-31 19:23:35 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-10-31 19:23:35 +0000
commitb0ba58b841f953bbdfcf62ae9ccc75c0fbfc538b (patch)
tree81a1cfe67a7e9da64bad8c9a38e274d3616db115
parentinstall: remove text describing obsolete differences between PKGBUILDs (diff)
config: improve error messages for invalid section keys
-rw-r--r--config.c27
1 files changed, 18 insertions, 9 deletions
diff --git a/config.c b/config.c
index 4e772aa1..450d0f14 100644
--- a/config.c
+++ b/config.c
@@ -1070,7 +1070,8 @@ parse_section_main(const char *key, const char *value, struct config *conf,
conf->box_drawings_uses_font_glyphs = str_to_bool(value);
else {
- LOG_AND_NOTIFY_ERR("%s:%u: [default]: %s: invalid key", path, lineno, key);
+ LOG_AND_NOTIFY_ERR("%s:%u: [default]: %s is not a valid option",
+ path, lineno, key);
return false;
}
@@ -1092,7 +1093,8 @@ parse_section_bell(const char *key, const char *value, struct config *conf,
else if (strcmp(key, "command-focused") == 0)
conf->bell.command_focused = str_to_bool(value);
else {
- LOG_AND_NOTIFY_ERR("%s:%u: [bell]: %s: invalid key", path, lineno, key);
+ LOG_AND_NOTIFY_ERR("%s:%u: [bell]: %s is not a valid option",
+ path, lineno, key);
return false;
}
@@ -1163,7 +1165,8 @@ parse_section_scrollback(const char *key, const char *value, struct config *conf
}
else {
- LOG_AND_NOTIFY_ERR("%s:%u: [scrollback]: %s: invalid key", path, lineno, key);
+ LOG_AND_NOTIFY_ERR("%s:%u: [scrollback]: %s is not a valid option",
+ path, lineno, key);
return false;
}
@@ -1274,7 +1277,8 @@ parse_section_url(const char *key, const char *value, struct config *conf,
}
else {
- LOG_AND_NOTIFY_ERR("%s:%d: [url]: %s: invalid key", path, lineno, key);
+ LOG_AND_NOTIFY_ERR("%s:%d: [url]: %s is not a valid option",
+ path, lineno, key);
return false;
}
@@ -1361,7 +1365,8 @@ parse_section_colors(const char *key, const char *value, struct config *conf,
}
else {
- LOG_AND_NOTIFY_ERR("%s:%d: [colors]: %s: invalid key", path, lineno, key);
+ LOG_AND_NOTIFY_ERR("%s:%d: [colors]: %s is not valid option",
+ path, lineno, key);
return false;
}
@@ -1422,7 +1427,8 @@ parse_section_cursor(const char *key, const char *value, struct config *conf,
}
else {
- LOG_AND_NOTIFY_ERR("%s:%d: [cursor]: %s: invalid key", path, lineno, key);
+ LOG_AND_NOTIFY_ERR("%s:%d: [cursor]: %s is not a valid option",
+ path, lineno, key);
return false;
}
@@ -1440,7 +1446,8 @@ parse_section_mouse(const char *key, const char *value, struct config *conf,
conf->mouse.alternate_scroll_mode = str_to_bool(value);
else {
- LOG_AND_NOTIFY_ERR("%s:%d: [mouse]: %s: invalid key", path, lineno, key);
+ LOG_AND_NOTIFY_ERR("%s:%d: [mouse]: %s is not a valid option",
+ path, lineno, key);
return false;
}
@@ -2353,7 +2360,8 @@ parse_section_mouse_bindings(
return true;
}
- LOG_AND_NOTIFY_ERR("%s:%u: [mouse-bindings]: %s: invalid key", path, lineno, key);
+ LOG_AND_NOTIFY_ERR("%s:%u: [mouse-bindings]: %s is not a valid option",
+ path, lineno, key);
free(pipe_argv);
return false;
}
@@ -2534,7 +2542,8 @@ parse_section_tweak(
conf->tweak.font_monospace_warn = str_to_bool(value);
else {
- LOG_AND_NOTIFY_ERR("%s:%u: [tweak]: %s: invalid key", path, lineno, key);
+ LOG_AND_NOTIFY_ERR("%s:%u: [tweak]: %s is not a valid option",
+ path, lineno, key);
return false;
}