From 824b2704df43f5a455e9ed9c01d871d1436be912 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 8 Mar 2025 15:47:33 +0100 Subject: minor misc improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/redshift.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) (limited to 'src/redshift.c') diff --git a/src/redshift.c b/src/redshift.c index 451c4bf..7170a03 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -31,22 +31,10 @@ struct pollfd { short events; short revents; }; -int poll(struct pollfd *fds, int nfds, int timeout) { abort(); return -1; } +int poll(struct pollfd *fds, int nfds, int timeout) { abort(); } #endif -/* Bounds for parameters. */ -#define MIN_LAT -90.0 -#define MAX_LAT 90.0 -#define MIN_LON -180.0 -#define MAX_LON 180.0 -#define MIN_TEMP 1000UL -#define MAX_TEMP 25000UL /* TODO README documents that there is no limit */ -#define MIN_BRIGHTNESS 0.1 -#define MAX_BRIGHTNESS 1.0 -#define MIN_GAMMA 0.1 -#define MAX_GAMMA 10.0 - /* Duration of sleep between screen updates (milliseconds). */ #define SLEEP_DURATION 5000 #define SLEEP_DURATION_SHORT 100 @@ -391,14 +379,14 @@ gamma_is_valid(const double gamma[3]) static int location_is_valid(const struct location *location) { - if (!WITHIN(MIN_LAT, location->lat, MAX_LAT)) { + if (!WITHIN(MIN_LATITUDE, location->lat, MAX_LATITUDE)) { /* TRANSLATORS: Append degree symbols if possible. */ - weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LAT, MAX_LAT); /* TODO \n */ + weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LATITUDE, MAX_LATITUDE); /* TODO \n */ return 0; } - if (!WITHIN(MIN_LON, location->lon, MAX_LON)) { + if (!WITHIN(MIN_LONGITUDE, location->lon, MAX_LONGITUDE)) { /* TRANSLATORS: Append degree symbols if possible. */ - weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LON, MAX_LON); /* TODO \n */ + weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LONGITUDE, MAX_LONGITUDE); /* TODO \n */ return 0; } return 1; @@ -789,15 +777,15 @@ main(int argc, char *argv[]) } /* Color temperature */ - if (!WITHIN(MIN_TEMP, options.scheme.day.temperature, MAX_TEMP) || - !WITHIN(MIN_TEMP, options.scheme.night.temperature, MAX_TEMP)) - eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMP, MAX_TEMP); + if (!WITHIN(MIN_TEMPERATURE, options.scheme.day.temperature, MAX_TEMPERATURE) || + !WITHIN(MIN_TEMPERATURE, options.scheme.night.temperature, MAX_TEMPERATURE)) + eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMPERATURE, MAX_TEMPERATURE); } if (options.mode == PROGRAM_MODE_MANUAL) { /* Check color temperature to be set */ - if (!WITHIN(MIN_TEMP, options.temp_set, MAX_TEMP)) - eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMP, MAX_TEMP); + if (!WITHIN(MIN_TEMPERATURE, options.temp_set, MAX_TEMPERATURE)) + eprintf(_("Temperature must be between %luK and %luK."), MIN_TEMPERATURE, MAX_TEMPERATURE); } /* Brightness */ -- cgit v1.2.3-70-g09d2