From 259604f63dba5f958b879813d1eaed9a59991d1e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 5 Mar 2025 20:59:57 +0100 Subject: Fix warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/redshift.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'src/redshift.c') diff --git a/src/redshift.c b/src/redshift.c index bbbb30b..bb01449 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -73,6 +73,20 @@ static const char *period_names[] = { }; +#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wfloat-equal" +#endif +static int +exact_eq(double a, double b) +{ + return a == b; +} +#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif + + /* Determine which period we are currently in based on time offset. */ static enum period get_period_from_time(const struct transition_scheme *transition, int time_offset) @@ -733,13 +747,11 @@ run_continual_mode(const struct location_provider *provider, if (done && fade_length == 0) break; if (verbose) { - if (prev_target_interp.temperature != - target_interp.temperature) { + if (prev_target_interp.temperature != target_interp.temperature) { printf(_("Color temperature: %uK\n"), target_interp.temperature); } - if (prev_target_interp.brightness != - target_interp.brightness) { + if (!exact_eq(prev_target_interp.brightness, target_interp.brightness)) { printf(_("Brightness: %.2f\n"), target_interp.brightness); } @@ -773,7 +785,7 @@ run_continual_mode(const struct location_provider *provider, if (loc_fd >= 0) { struct pollfd pollfds[1]; struct location new_loc; - int r, new_available; + int new_available; /* Provider is dynamic. */ pollfds[0].fd = loc_fd; @@ -809,8 +821,8 @@ run_continual_mode(const struct location_provider *provider, } if (new_available && - (new_loc.lat != loc.lat || - new_loc.lon != loc.lon || + (!exact_eq(new_loc.lat, loc.lat) || + !exact_eq(new_loc.lon, loc.lon) || new_available != location_available)) { loc = new_loc; print_location(&loc); -- cgit v1.2.3-70-g09d2