commit 4eeca10a8a1bdef73c0ad7dc8e4d74bb31507676
parent 8c526bbb03a5171422cf71b0217d271feeb072b6
Author: Dominique Martinet <asmadeus@codewreck.org>
Date: Sun, 1 Jul 2018 23:36:44 +0900
load_config: move NULL path check before first use
Found through static analysis
Diffstat:
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sway/config.c b/sway/config.c
@@ -302,6 +302,11 @@ static char *get_config_path(void) {
const char *current_config_path;
static bool load_config(const char *path, struct sway_config *config) {
+ if (path == NULL) {
+ wlr_log(L_ERROR, "Unable to find a config file!");
+ return false;
+ }
+
wlr_log(L_INFO, "Loading config from %s", path);
current_config_path = path;
@@ -310,11 +315,6 @@ static bool load_config(const char *path, struct sway_config *config) {
return false;
}
- if (path == NULL) {
- wlr_log(L_ERROR, "Unable to find a config file!");
- return false;
- }
-
FILE *f = fopen(path, "r");
if (!f) {
wlr_log(L_ERROR, "Unable to open %s for reading", path);