aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Barnes <craigbarnes@protonmail.com>2021-11-21 10:44:24 +0000
committerCraig Barnes <craigbarnes@protonmail.com>2021-11-21 10:44:24 +0000
commitc683116f8a41f74581c325ccff07c76dc9d81f81 (patch)
tree8da9cc3fde028731cedbd7f14c0c0cfe3d80c491
parentMerge branch 'theme-papercolor' (diff)
parentconfig: Simplify render-timer option handling (diff)
Merge branch 'remove-unreachable'
-rw-r--r--config.c31
1 files changed, 4 insertions, 27 deletions
diff --git a/config.c b/config.c
index fdca96cd..dfbe1c51 100644
--- a/config.c
+++ b/config.c
@@ -1014,8 +1014,6 @@ parse_section_main(struct context *ctx)
LOG_CONTEXTUAL_ERR("not a valid option: %s", key);
return false;
}
-
- UNREACHABLE();
}
static bool
@@ -2267,29 +2265,10 @@ parse_section_tweak(struct context *ctx)
return false;
}
- switch (mode) {
- case 0:
- conf->tweak.render_timer_osd = false;
- conf->tweak.render_timer_log = false;
- return true;
-
- case 1:
- conf->tweak.render_timer_osd = true;
- conf->tweak.render_timer_log = false;
- return true;
-
- case 2:
- conf->tweak.render_timer_osd = false;
- conf->tweak.render_timer_log = true;
- return true;
-
- case 3:
- conf->tweak.render_timer_osd = true;
- conf->tweak.render_timer_log = true;
- return true;
- }
-
- UNREACHABLE();
+ xassert(0 <= mode && mode <= 3);
+ conf->tweak.render_timer_osd = mode == 1 || mode == 3;
+ conf->tweak.render_timer_log = mode == 2 || mode == 3;
+ return true;
}
else if (strcmp(key, "delayed-render-lower") == 0) {
@@ -2342,8 +2321,6 @@ parse_section_tweak(struct context *ctx)
LOG_CONTEXTUAL_ERR("not a valid option: %s", key);
return false;
}
-
- UNREACHABLE();
}
static bool