From 6a6b10be7642e59ae40f9911282a8e2aa2601d82 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 8 Mar 2025 13:27:09 +0100 Subject: misc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/options.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'src/options.c') diff --git a/src/options.c b/src/options.c index fafc603..c25eb03 100644 --- a/src/options.c +++ b/src/options.c @@ -15,7 +15,7 @@ * along with redshift-ng. If not, see . * * Copyright (c) 2017 Jon Lund Steffensen - * Copyright (c) 2025 Mattias Andrée + * Copyright (c) 2025 Mattias Andrée */ #include "common.h" @@ -27,8 +27,8 @@ #define TRANSITION_HIGH 3.0 /* Default values for parameters. */ -#define DEFAULT_DAY_TEMP 6500 -#define DEFAULT_NIGHT_TEMP 4500 +#define DEFAULT_DAY_TEMP 6500UL +#define DEFAULT_NIGHT_TEMP 4500UL #define DEFAULT_BRIGHTNESS 1.0 #define DEFAULT_GAMMA 1.0 @@ -67,7 +67,7 @@ parse_gamma_string(const char *str, double gamma[3]) if (!s) return -1; - *(s++) = '\0'; + *s++ = '\0'; gamma[0] = atof(str); /* Red */ gamma[1] = atof(g_s); /* Blue */ gamma[2] = atof(s); /* Green */ @@ -189,8 +189,8 @@ print_help(void) /* TRANSLATORS: help output 6 */ printf(_("Default values:\n\n" - " Daytime temperature: %uK\n" - " Night temperature: %uK\n"), + " Daytime temperature: %luK\n" + " Night temperature: %luK\n"), DEFAULT_DAY_TEMP, DEFAULT_NIGHT_TEMP); fputs("\n", stdout); @@ -228,6 +228,7 @@ print_provider_list(void) } /* Return the gamma method with the given name. */ +GCC_ONLY(__attribute__((__pure__))) static const struct gamma_method * find_gamma_method(const char *name) { @@ -239,6 +240,7 @@ find_gamma_method(const char *name) } /* Return location provider with the given name. */ +GCC_ONLY(__attribute__((__pure__))) static const struct location_provider * find_location_provider(const char *name) { @@ -269,16 +271,16 @@ options_init(struct options *options) options->scheme.dusk.start = -1; options->scheme.dusk.end = -1; - options->scheme.day.temperature = -1; + options->scheme.day.temperature = 0; options->scheme.day.gamma[0] = NAN; options->scheme.day.brightness = NAN; - options->scheme.night.temperature = -1; + options->scheme.night.temperature = 0; options->scheme.night.gamma[0] = NAN; options->scheme.night.brightness = NAN; /* Temperature for manual mode */ - options->temp_set = -1; + options->temp_set = 0; options->method = NULL; options->method_args = NULL; @@ -457,10 +459,10 @@ static void parse_config_file_option(const char *key, const char *value, struct options *options) { if (!strcasecmp(key, "temp-day")) { - if (options->scheme.day.temperature < 0) + if (!options->scheme.day.temperature) options->scheme.day.temperature = atoi(value); } else if (!strcasecmp(key, "temp-night")) { - if (options->scheme.night.temperature < 0) + if (!options->scheme.night.temperature) options->scheme.night.temperature = atoi(value); } else if (!strcasecmp(key, "transition") || !strcasecmp(key, "fade")) { /* "fade" is preferred, "transition" is deprecated as the setting key. */ @@ -547,9 +549,9 @@ options_parse_config_file(struct options *options, struct config_ini_state *conf void options_set_defaults(struct options *options) { - if (options->scheme.day.temperature < 0) + if (!options->scheme.day.temperature) options->scheme.day.temperature = DEFAULT_DAY_TEMP; - if (options->scheme.night.temperature < 0) + if (!options->scheme.night.temperature) options->scheme.night.temperature = DEFAULT_NIGHT_TEMP; if (isnan(options->scheme.day.brightness)) -- cgit v1.2.3-70-g09d2