From 96a6575e23b5baebcdd38269b80f47cc02a2627e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 21 Mar 2025 16:50:15 +0100 Subject: Refactor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/config-ini.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/config-ini.c') diff --git a/src/config-ini.c b/src/config-ini.c index 1a78903..015668f 100644 --- a/src/config-ini.c +++ b/src/config-ini.c @@ -1,4 +1,5 @@ -/* redshift-ng - Automatically adjust display colour temperature according the Sun +/*- + * redshift-ng - Automatically adjust display colour temperature according the Sun * * Copyright (c) 2009-2018 Jon Lund Steffensen * Copyright (c) 2014-2016, 2025 Mattias Andrée @@ -27,7 +28,7 @@ static const struct env_path paths[] = { {0, "XDG_CONFIG_HOME", "/redshift-ng/redshift.conf"}, {0, "XDG_CONFIG_HOME", "/redshift/redshift.conf"}, {0, "XDG_CONFIG_HOME", "/redshift.conf"}, -#ifdef WINDOWS +#if defined(WINDOWS) {0, "localappdata", "/redshift-ng/redshift.conf"}, {0, "localappdata", "/redshift/redshift.conf"}, {0, "localappdata", "/redshift.conf"}, @@ -43,9 +44,11 @@ static const struct env_path paths[] = { {1, "XDG_CONFIG_DIRS", "/redshift-ng/redshift.conf"}, {1, "XDG_CONFIG_DIRS", "/redshift/redshift.conf"}, {1, "XDG_CONFIG_DIRS", "/redshift.conf"}, +#if !defined(WINDOWS) {0, "", "/etc/redshift-ng/redshift.conf"}, {0, "", "/etc/redshift/redshift.conf"}, {0, "", "/etc/redshift.conf"} +#endif }; @@ -95,7 +98,7 @@ config_ini_init(struct config_ini_state *state, const char *path) char *line = NULL, *s, *p, *value, *end, *pathbuf; char *next_line = NULL, *name; size_t size = 0; - ssize_t len; + ssize_t len = 0; /* initialised to silence false warning from clang */ FILE *f; state->sections = NULL; -- cgit v1.2.3-70-g09d2