sway

commit 5ed999b1101e5a5830461f56977950232a6c8106
parent 6cc8ea29e51b785a75b2f5e6242e76dc1804002c
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sat, 15 Aug 2015 21:14:59 -0400

Merge pull request #37 from Luminarys/master

Minor fix to config loading
Diffstat:
M
sway/config.c
 | 
4
+---

1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sway/config.c b/sway/config.c
@@ -76,7 +76,7 @@ static char* get_config_path() {
 	//Now fall back to i3 paths and try the same thing
 	name = "/.i3/config";
 	sway_log(L_DEBUG, "Trying to find config in ~/.i3/config");
-	char *temp = malloc(strlen(home) + strlen(name) + 1);
+	temp = malloc(strlen(home) + strlen(name) + 1);
 	strcpy(temp, home);
 	strcat(temp, name);
 	if (exists(temp)) {
@@ -84,7 +84,6 @@ static char* get_config_path() {
 	}
 
 	sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_HOME/i3/config");
-	char *xdg_config_home = getenv("XDG_CONFIG_HOME");
 	if (xdg_config_home == NULL) {
 		sway_log(L_DEBUG, "Falling back to ~/.config/i3/config");
 		name = "/.config/i3/config";
@@ -108,7 +107,6 @@ static char* get_config_path() {
 	}
 
 	sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS");
-	char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
 	if (xdg_config_dirs != NULL) {
 		list_t *paths = split_string(xdg_config_dirs, ":");
 		name = "/i3/config";