aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-11-06 10:32:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-11-13 10:04:29 +0000
commit3b27a665da60837a455ca0b39e99625ad85ade75 (patch)
tree206bf719e15bc3218189a74d33311c44e70633fb
parentconfig: value_to_bool: return success/fail (diff)
config: add value_to_str()
Takes a pointer to a char*, free:s it, and strdups the current value.
-rw-r--r--config.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/config.c b/config.c
index 09d684dc..7d12ac91 100644
--- a/config.c
+++ b/config.c
@@ -525,6 +525,14 @@ value_to_double(struct context *ctx, double *res)
}
static bool NOINLINE
+value_to_str(struct context *ctx, char **res)
+{
+ free(*res);
+ *res = xstrdup(ctx->value);
+ return true;
+}
+
+static bool NOINLINE
value_to_wchars(struct context *ctx, wchar_t **res)
{
*res = NULL;
@@ -825,32 +833,23 @@ parse_section_main(struct context *ctx)
return ret;
}
- else if (strcmp(key, "term") == 0) {
- free(conf->term);
- conf->term = xstrdup(value);
- }
+ else if (strcmp(key, "term") == 0)
+ return value_to_str(ctx, &conf->term);
- else if (strcmp(key, "shell") == 0) {
- free(conf->shell);
- conf->shell = xstrdup(value);
- }
+ else if (strcmp(key, "shell") == 0)
+ return value_to_str(ctx, &conf->shell);
- else if (strcmp(key, "login-shell") == 0) {
+ else if (strcmp(key, "login-shell") == 0)
return value_to_bool(ctx, &conf->login_shell);
- }
- else if (strcmp(key, "title") == 0) {
- free(conf->title);
- conf->title = xstrdup(value);
- }
+ else if (strcmp(key, "title") == 0)
+ return value_to_str(ctx, &conf->title);
else if (strcmp(key, "locked-title") == 0)
return value_to_bool(ctx, &conf->locked_title);
- else if (strcmp(key, "app-id") == 0) {
- free(conf->app_id);
- conf->app_id = xstrdup(value);
- }
+ else if (strcmp(key, "app-id") == 0)
+ return value_to_str(ctx, &conf->app_id);
else if (strcmp(key, "initial-window-size-pixels") == 0) {
unsigned width, height;