config: fix const configfile

emersion · Mar 1, 2021 · 7b347fe · 7b347fe
1 parent 4a35ce4
commit 7b347fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/include/config.h b/include/config.h
@@ -13,6 +13,6 @@ struct xdpw_config {
 
 void print_config(enum LOGLEVEL loglevel, struct xdpw_config *config);
 void finish_config(struct xdpw_config *config);
-void init_config(const char **configfile, struct xdpw_config *config);
+void init_config(const char ** const configfile, struct xdpw_config *config);
 
 #endif
diff --git a/src/core/config.c b/src/core/config.c
@@ -76,7 +76,7 @@ static void config_parse_file(const char *configfile, struct xdpw_config *config
 	print_config(DEBUG, config);
 }
 
-static char *get_config_path(void) {
+static const char *get_config_path(void) {
 	const char *home = getenv("HOME");
 	size_t size_fallback = 1 + strlen(home) + strlen("/.config");
 	char *config_home_fallback = calloc(size_fallback, sizeof(char));
@@ -109,7 +109,7 @@ static char *get_config_path(void) {
 	return NULL;
 }
 
-void init_config(const char **configfile, struct xdpw_config *config) {
+void init_config(const char ** const configfile, struct xdpw_config *config) {
 	if (*configfile == NULL) {
 		*configfile = get_config_path();
 	}

diff --git a/src/core/main.c b/src/core/main.c
@@ -42,7 +42,7 @@ static int handle_name_lost(sd_bus_message *m, void *userdata, sd_bus_error *ret
 
 int main(int argc, char *argv[]) {
 	struct xdpw_config config = {0};
-	const char *configfile = NULL;
+	char *configfile = NULL;
 	enum LOGLEVEL loglevel = DEFAULT_LOGLEVEL;
 	bool replace = false;
 
@@ -82,7 +82,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	init_logger(stderr, loglevel);
-	init_config(&configfile, &config);
+	init_config((const char ** const)&configfile, &config);
 
 	int ret = 0;
 
@@ -227,7 +227,7 @@ int main(int argc, char *argv[]) {
 
 	// TODO: cleanup
 	finish_config(&config);
-	free((char *)configfile);
+	free(configfile);
 
 	return EXIT_SUCCESS;