aboutsummaryrefslogtreecommitdiffstats
path: root/src/redshift.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/redshift.c')
-rw-r--r--src/redshift.c435
1 files changed, 147 insertions, 288 deletions
diff --git a/src/redshift.c b/src/redshift.c
index bb01449..d150f06 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -15,6 +15,7 @@
along with Redshift. If not, see <http://www.gnu.org/licenses/>.
Copyright (c) 2009-2017 Jon Lund Steffensen <jonlst@gmail.com>
+ Copyright (c) 2025 Mattias Andrée <m@maandre.se>
*/
#include "common.h"
#include "solar.h"
@@ -91,65 +92,50 @@ exact_eq(double a, double b)
static enum period
get_period_from_time(const struct transition_scheme *transition, int time_offset)
{
- if (time_offset < transition->dawn.start ||
- time_offset >= transition->dusk.end) {
+ if (time_offset < transition->dawn.start || time_offset >= transition->dusk.end)
return PERIOD_NIGHT;
- } else if (time_offset >= transition->dawn.end &&
- time_offset < transition->dusk.start) {
+ else if (time_offset >= transition->dawn.end && time_offset < transition->dusk.start)
return PERIOD_DAYTIME;
- } else {
+ else
return PERIOD_TRANSITION;
- }
}
/* Determine which period we are currently in based on solar elevation. */
static enum period
-get_period_from_elevation(
- const struct transition_scheme *transition, double elevation)
+get_period_from_elevation(const struct transition_scheme *transition, double elevation)
{
- if (elevation < transition->low) {
+ if (elevation < transition->low)
return PERIOD_NIGHT;
- } else if (elevation < transition->high) {
+ else if (elevation < transition->high)
return PERIOD_TRANSITION;
- } else {
+ else
return PERIOD_DAYTIME;
- }
}
/* Determine how far through the transition we are based on time offset. */
static double
-get_transition_progress_from_time(
- const struct transition_scheme *transition, int time_offset)
+get_transition_progress_from_time(const struct transition_scheme *transition, int time_offset)
{
- if (time_offset < transition->dawn.start ||
- time_offset >= transition->dusk.end) {
+ if (time_offset < transition->dawn.start || time_offset >= transition->dusk.end)
return 0.0;
- } else if (time_offset < transition->dawn.end) {
- return (transition->dawn.start - time_offset) /
- (double)(transition->dawn.start -
- transition->dawn.end);
- } else if (time_offset > transition->dusk.start) {
- return (transition->dusk.end - time_offset) /
- (double)(transition->dusk.end -
- transition->dusk.start);
- } else {
+ else if (time_offset < transition->dawn.end)
+ return (transition->dawn.start - time_offset) / (double)(transition->dawn.start - transition->dawn.end);
+ else if (time_offset > transition->dusk.start)
+ return (transition->dusk.end - time_offset) / (double)(transition->dusk.end - transition->dusk.start);
+ else
return 1.0;
- }
}
/* Determine how far through the transition we are based on elevation. */
static double
-get_transition_progress_from_elevation(
- const struct transition_scheme *transition, double elevation)
+get_transition_progress_from_elevation(const struct transition_scheme *transition, double elevation)
{
- if (elevation < transition->low) {
+ if (elevation < transition->low)
return 0.0;
- } else if (elevation < transition->high) {
- return (transition->low - elevation) /
- (transition->low - transition->high);
- } else {
+ else if (elevation < transition->high)
+ return (transition->low - elevation) / (transition->low - transition->high);
+ else
return 1.0;
- }
}
/* Return number of seconds since midnight from timestamp. */
@@ -158,11 +144,7 @@ get_seconds_since_midnight(double timestamp)
{
time_t t = (time_t)timestamp;
struct tm tm;
-#ifdef WINDOWS
- localtime_s(&tm, &t);
-#else
localtime_r(&t, &tm);
-#endif
return tm.tm_sec + tm.tm_min * 60 + tm.tm_hour * 3600;
}
@@ -177,9 +159,7 @@ print_period(enum period period, double transition)
printf(_("Period: %s\n"), gettext(period_names[period]));
break;
case PERIOD_TRANSITION:
- printf(_("Period: %s (%.2f%% day)\n"),
- gettext(period_names[period]),
- transition*100);
+ printf(_("Period: %s (%.2f%% day)\n"), gettext(period_names[period]), transition * 100);
break;
}
}
@@ -207,44 +187,30 @@ print_location(const struct location *location)
/* Interpolate color setting structs given alpha. */
static void
-interpolate_color_settings(
- const struct color_setting *first,
- const struct color_setting *second,
- double alpha,
- struct color_setting *result)
+interpolate_color_settings(const struct color_setting *first, const struct color_setting *second,
+ double alpha, struct color_setting *result)
{
+ int i;
+
alpha = CLAMP(0.0, alpha, 1.0);
- result->temperature = (1.0-alpha)*first->temperature +
- alpha*second->temperature;
- result->brightness = (1.0-alpha)*first->brightness +
- alpha*second->brightness;
- for (int i = 0; i < 3; i++) {
- result->gamma[i] = (1.0-alpha)*first->gamma[i] +
- alpha*second->gamma[i];
- }
+ result->temperature = (1.0 - alpha) * first->temperature + alpha * second->temperature;
+ result->brightness = (1.0 - alpha) * first->brightness + alpha * second->brightness;
+ for (i = 0; i < 3; i++)
+ result->gamma[i] = (1.0 - alpha) * first->gamma[i] + alpha * second->gamma[i];
}
/* Interpolate color setting structs transition scheme. */
static void
-interpolate_transition_scheme(
- const struct transition_scheme *transition,
- double alpha,
- struct color_setting *result)
+interpolate_transition_scheme(const struct transition_scheme *transition, double alpha, struct color_setting *result)
{
- const struct color_setting *day = &transition->day;
- const struct color_setting *night = &transition->night;
-
- alpha = CLAMP(0.0, alpha, 1.0);
- interpolate_color_settings(night, day, alpha, result);
+ interpolate_color_settings(&transition->night, &transition->day, alpha, result);
}
/* Return 1 if color settings have major differences, otherwise 0.
Used to determine if a fade should be applied in continual mode. */
static int
-color_setting_diff_is_major(
- const struct color_setting *first,
- const struct color_setting *second)
+color_setting_diff_is_major(const struct color_setting *first, const struct color_setting *second)
{
return (abs(first->temperature - second->temperature) > 25 ||
fabs(first->brightness - second->brightness) > 0.1 ||
@@ -266,95 +232,75 @@ color_setting_reset(struct color_setting *color)
static int
-provider_try_start(const struct location_provider *provider,
- LOCATION_STATE **state, struct config_ini_state *config,
- char *args)
+provider_try_start(const struct location_provider *provider, LOCATION_STATE **state,
+ struct config_ini_state *config, char *args)
{
- const char *manual_keys[] = { "lat", "lon" };
+ const char *manual_keys[] = {"lat", "lon"};
struct config_ini_section *section;
- int r, i;
+ struct config_ini_setting *setting;
+ int i;
- r = provider->init(state);
- if (r < 0) {
- fprintf(stderr, _("Initialization of %s failed.\n"),
- provider->name);
+ if (provider->init(state) < 0) {
+ weprintf(_("Initialization of %s failed.\n"), provider->name);
return -1;
}
/* Set provider options from config file. */
- section = config_ini_get_section(config, provider->name);
- if (section != NULL) {
- struct config_ini_setting *setting = section->settings;
- while (setting != NULL) {
- r = provider->set_option(*state, setting->name,
- setting->value);
- if (r < 0) {
+ if ((section = config_ini_get_section(config, provider->name))) {
+ for (setting = section->settings; setting; setting = setting->next) {
+ if (provider->set_option(*state, setting->name, setting->value) < 0) {
provider->free(*state);
- fprintf(stderr, _("Failed to set %s"
- " option.\n"),
- provider->name);
- /* TRANSLATORS: `help' must not be
- translated. */
- fprintf(stderr, _("Try `-l %s:help' for more"
- " information.\n"),
- provider->name);
+ weprintf(_("Failed to set %s option.\n"), provider->name);
+ /* TRANSLATORS: `help' must not be translated. */
+ weprintf(_("Try `-l %s:help' for more information.\n"), provider->name);
return -1;
}
- setting = setting->next;
}
}
/* Set provider options from command line. */
- i = 0;
- while (args != NULL) {
+ for (i = 0; args; i++) {
char *next_arg;
const char *key;
char *value;
next_arg = strchr(args, ':');
- if (next_arg != NULL) *(next_arg++) = '\0';
+ if (next_arg)
+ *next_arg++ = '\0';
key = args;
value = strchr(args, '=');
- if (value == NULL) {
+ if (!value) {
/* The options for the "manual" method can be set
without keys on the command line for convencience
and for backwards compatability. We add the proper
keys here before calling set_option(). */
- if (strcmp(provider->name, "manual") == 0 &&
- i < sizeof(manual_keys)/sizeof(manual_keys[0])) {
+ if (!strcmp(provider->name, "manual") && i < ELEMSOF(manual_keys)) {
key = manual_keys[i];
value = args;
} else {
- fprintf(stderr, _("Failed to parse option `%s'.\n"),
- args);
+ weprintf(_("Failed to parse option `%s'.\n"), args);
return -1;
}
} else {
- *(value++) = '\0';
+ *value++ = '\0';
}
- r = provider->set_option(*state, key, value);
- if (r < 0) {
+ if (provider->set_option(*state, key, value) < 0) {
provider->free(*state);
- fprintf(stderr, _("Failed to set %s option.\n"),
- provider->name);
+ weprintf(_("Failed to set %s option.\n"), provider->name);
/* TRANSLATORS: `help' must not be translated. */
- fprintf(stderr, _("Try `-l %s:help' for more"
- " information.\n"), provider->name);
+ weprintf(_("Try `-l %s:help' for more information.\n"), provider->name);
return -1;
}
args = next_arg;
- i += 1;
}
/* Start provider. */
- r = provider->start(*state);
- if (r < 0) {
+ if (provider->start(*state) < 0) {
provider->free(*state);
- fprintf(stderr, _("Failed to start provider %s.\n"),
- provider->name);
+ weprintf(_("Failed to start provider %s.\n"), provider->name);
return -1;
}
@@ -366,35 +312,23 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
enum program_mode mode, struct config_ini_state *config, char *args)
{
struct config_ini_section *section;
- int r;
+ struct config_ini_setting *setting;
- r = method->init(state);
- if (r < 0) {
- fprintf(stderr, _("Initialization of %s failed.\n"),
- method->name);
+ if (method->init(state) < 0) {
+ weprintf(_("Initialization of %s failed.\n"), method->name);
return -1;
}
/* Set method options from config file. */
- section = config_ini_get_section(config, method->name);
- if (section != NULL) {
- struct config_ini_setting *setting = section->settings;
- while (setting != NULL) {
- r = method->set_option(
- *state, setting->name, setting->value);
- if (r < 0) {
+ if ((section = config_ini_get_section(config, method->name))) {
+ for (setting = section->settings; setting; setting = setting->next) {
+ if (method->set_option(*state, setting->name, setting->value) < 0) {
method->free(*state);
- fprintf(stderr, _("Failed to set %s"
- " option.\n"),
- method->name);
- /* TRANSLATORS: `help' must not be
- translated. */
- fprintf(stderr, _("Try `-m %s:help' for more"
- " information.\n"),
- method->name);
+ weprintf(_("Failed to set %s option.\n"), method->name);
+ /* TRANSLATORS: `help' must not be translated. */
+ weprintf(_("Try `-m %s:help' for more information.\n"), method->name);
return -1;
}
- setting = setting->next;
}
}
@@ -405,26 +339,22 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
char *value;
next_arg = strchr(args, ':');
- if (next_arg != NULL) *(next_arg++) = '\0';
+ if (next_arg != NULL)
+ *next_arg++ = '\0';
key = args;
value = strchr(args, '=');
- if (value == NULL) {
- fprintf(stderr, _("Failed to parse option `%s'.\n"),
- args);
+ if (!value) {
+ weprintf(_("Failed to parse option `%s'.\n"), args);
return -1;
- } else {
- *(value++) = '\0';
}
+ *value++ = '\0';
- r = method->set_option(*state, key, value);
- if (r < 0) {
+ if (method->set_option(*state, key, value) < 0) {
method->free(*state);
- fprintf(stderr, _("Failed to set %s option.\n"),
- method->name);
+ weprintf(_("Failed to set %s option.\n"), method->name);
/* TRANSLATORS: `help' must not be translated. */
- fprintf(stderr, _("Try -m %s:help' for more"
- " information.\n"), method->name);
+ weprintf(_("Try -m %s:help' for more information.\n"), method->name);
return -1;
}
@@ -432,11 +362,9 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
}
/* Start method. */
- r = method->start(*state, mode);
- if (r < 0) {
+ if (method->start(*state, mode) < 0) {
method->free(*state);
- fprintf(stderr, _("Failed to start adjustment method %s.\n"),
- method->name);
+ weprintf(_("Failed to start adjustment method %s.\n"), method->name);
return -1;
}
@@ -462,18 +390,14 @@ location_is_valid(const struct location *location)
/* Latitude */
if (location->lat < MIN_LAT || location->lat > MAX_LAT) {
/* TRANSLATORS: Append degree symbols if possible. */
- fprintf(stderr,
- _("Latitude must be between %.1f and %.1f.\n"),
- MIN_LAT, MAX_LAT);
+ weprintf(_("Latitude must be between %.1f and %.1f.\n"), MIN_LAT, MAX_LAT);
return 0;
}
/* Longitude */
if (location->lon < MIN_LON || location->lon > MAX_LON) {
/* TRANSLATORS: Append degree symbols if possible. */
- fprintf(stderr,
- _("Longitude must be between"
- " %.1f and %.1f.\n"), MIN_LON, MAX_LON);
+ weprintf(_("Longitude must be between %.1f and %.1f.\n"), MIN_LON, MAX_LON);
return 0;
}
@@ -485,25 +409,19 @@ location_is_valid(const struct location *location)
is -1. Writes location to loc. Returns -1 on error,
0 if timeout was reached, 1 if location became available. */
static int
-provider_get_location(
- const struct location_provider *provider, LOCATION_STATE *state,
- int timeout, struct location *loc)
+provider_get_location(const struct location_provider *provider, LOCATION_STATE *state, int timeout, struct location *loc)
{
- int available = 0;
+ int r, available, loc_fd;
struct pollfd pollfds[1];
- while (!available) {
- int loc_fd = provider->get_fd(state);
- if (loc_fd >= 0) {
- double now;
- double later;
- int r;
+ double now, later;
+ do {
+ loc_fd = provider->get_fd(state);
+ if (loc_fd >= 0) {
/* Provider is dynamic. */
/* TODO: This should use a monotonic time source. */
- r = systemtime_get_time(&now);
- if (r < 0) {
- fputs(_("Unable to read system time.\n"),
- stderr);
+ if (systemtime_get_time(&now) < 0) {
+ weprintf(_("Unable to read system time.\n"));
return -1;
}
@@ -512,30 +430,27 @@ provider_get_location(
pollfds[0].events = POLLIN;
r = poll(pollfds, 1, timeout);
if (r < 0) {
- perror("poll");
+ weprintf("poll {{.fd=<location provider>, .events=EPOLLIN}} 1 %i:", timeout);
return -1;
} else if (r == 0) {
return 0;
}
- r = systemtime_get_time(&later);
- if (r < 0) {
- fputs(_("Unable to read system time.\n"),
- stderr);
+ if (systemtime_get_time(&later) < 0) {
+ weprintf(_("Unable to read system time.\n"));
return -1;
}
/* Adjust timeout by elapsed time */
if (timeout >= 0) {
timeout -= (later - now) * 1000;
- timeout = timeout < 0 ? 0 : timeout;
+ timeout = MAX(timeout, 0);
}
}
-
if (provider->handle(state, loc, &available) < 0)
return -1;
- }
+ } while (!available);
return 1;
}
@@ -564,8 +479,6 @@ run_continual_mode(const struct location_provider *provider,
GAMMA_STATE *method_state,
int use_fade, int preserve_gamma, int verbose)
{
- int r;
-
int done = 0;
int prev_disabled = 1;
int disabled = 0;
@@ -584,10 +497,8 @@ run_continual_mode(const struct location_provider *provider,
the values did not change. */
enum period prev_period = PERIOD_NONE;
- r = signals_install_handlers();
- if (r < 0) {
- return r;
- }
+ if (signals_install_handlers())
+ return -1;
/* Previous target color setting and current actual color setting.
Actual color setting takes into account the current color fade. */
@@ -598,20 +509,16 @@ run_continual_mode(const struct location_provider *provider,
loc = (struct location){ NAN, NAN };
need_location = !scheme->use_time;
if (need_location) {
- fputs(_("Waiting for initial location"
- " to become available...\n"), stderr);
+ weprintf(_("Waiting for initial location to become available...\n"));
/* Get initial location from provider */
- r = provider_get_location(provider, location_state, -1, &loc);
- if (r < 0) {
- fputs(_("Unable to get location"
- " from provider.\n"), stderr);
+ if (provider_get_location(provider, location_state, -1, &loc) < 0) {
+ weprintf(_("Unable to get location from provider.\n"));
return -1;
}
if (!location_is_valid(&loc)) {
- fputs(_("Invalid location returned from provider.\n"),
- stderr);
+ weprintf(_("Invalid location returned from provider.\n"));
return -1;
}
@@ -650,17 +557,14 @@ run_continual_mode(const struct location_provider *provider,
}
/* Print status change */
- if (verbose && disabled != prev_disabled) {
- printf(_("Status: %s\n"), disabled ?
- _("Disabled") : _("Enabled"));
- }
+ if (verbose && disabled != prev_disabled)
+ printf(_("Status: %s\n"), disabled ? _("Disabled") : _("Enabled"));
prev_disabled = disabled;
/* Read timestamp */
- r = systemtime_get_time(&now);
- if (r < 0) {
- fputs(_("Unable to read system time.\n"), stderr);
+ if (systemtime_get_time(&now) < 0) {
+ weprintf(_("Unable to read system time.\n"));
return -1;
}
@@ -668,58 +572,42 @@ run_continual_mode(const struct location_provider *provider,
int time_offset = get_seconds_since_midnight(now);
period = get_period_from_time(scheme, time_offset);
- transition_prog = get_transition_progress_from_time(
- scheme, time_offset);
+ transition_prog = get_transition_progress_from_time(scheme, time_offset);
} else {
/* Current angular elevation of the sun */
- double elevation = solar_elevation(
- now, loc.lat, loc.lon);
+ double elevation = solar_elevation(now, loc.lat, loc.lon);
period = get_period_from_elevation(scheme, elevation);
- transition_prog =
- get_transition_progress_from_elevation(
- scheme, elevation);
+ transition_prog = get_transition_progress_from_elevation(scheme, elevation);
}
- /* Use transition progress to get target color
- temperature. */
- interpolate_transition_scheme(
- scheme, transition_prog, &target_interp);
+ /* Use transition progress to get target color temperature. */
+ interpolate_transition_scheme(scheme, transition_prog, &target_interp);
if (disabled) {
period = PERIOD_NONE;
color_setting_reset(&target_interp);
}
- if (done) {
+ if (done)
period = PERIOD_NONE;
- }
/* Print period if it changed during this update,
or if we are in the transition period. In transition we
print the progress, so we always print it in
that case. */
- if (verbose && (period != prev_period ||
- period == PERIOD_TRANSITION)) {
+ if (verbose && (period != prev_period || period == PERIOD_TRANSITION))
print_period(period, transition_prog);
- }
/* Activate hooks if period changed */
- if (period != prev_period) {
+ if (period != prev_period)
hooks_signal_period_change(prev_period, period);
- }
/* Start fade if the parameter differences are too big to apply
instantly. */
if (use_fade) {
- if ((fade_length == 0 &&
- color_setting_diff_is_major(
- &interp,
- &target_interp)) ||
- (fade_length != 0 &&
- color_setting_diff_is_major(
- &target_interp,
- &prev_target_interp))) {
+ if (fade_length ? color_setting_diff_is_major(&target_interp, &prev_target_interp)
+ : color_setting_diff_is_major(&interp, &target_interp)) {
fade_length = FADE_LENGTH;
fade_time = 0;
fade_start_interp = interp;
@@ -731,9 +619,7 @@ run_continual_mode(const struct location_provider *provider,
double frac = ++fade_time / (double)fade_length;
double alpha = CLAMP(0.0, ease_fade(frac), 1.0);
- interpolate_color_settings(
- &fade_start_interp, &target_interp, alpha,
- &interp);
+ interpolate_color_settings(&fade_start_interp, &target_interp, alpha, &interp);
if (fade_time > fade_length) {
fade_time = 0;
@@ -747,22 +633,15 @@ run_continual_mode(const struct location_provider *provider,
if (done && fade_length == 0) break;
if (verbose) {
- if (prev_target_interp.temperature != target_interp.temperature) {
- printf(_("Color temperature: %uK\n"),
- target_interp.temperature);
- }
- if (!exact_eq(prev_target_interp.brightness, target_interp.brightness)) {
- printf(_("Brightness: %.2f\n"),
- target_interp.brightness);
- }
+ if (prev_target_interp.temperature != target_interp.temperature)
+ printf(_("Color temperature: %uK\n"), target_interp.temperature);
+ if (!exact_eq(prev_target_interp.brightness, target_interp.brightness))
+ printf(_("Brightness: %.2f\n"), target_interp.brightness);
}
/* Adjust temperature */
- r = method->set_temperature(
- method_state, &interp, preserve_gamma);
- if (r < 0) {
- fputs(_("Temperature adjustment failed.\n"),
- stderr);
+ if (method->set_temperature(method_state, &interp, preserve_gamma) < 0) {
+ weprintf(_("Temperature adjustment failed.\n"));
return -1;
}
@@ -777,25 +656,22 @@ run_continual_mode(const struct location_provider *provider,
}
/* Update location. */
- loc_fd = -1;
- if (need_location) {
- loc_fd = provider->get_fd(location_state);
- }
+ loc_fd = need_location ? provider->get_fd(location_state) : -1;
if (loc_fd >= 0) {
struct pollfd pollfds[1];
struct location new_loc;
- int new_available;
+ int r, new_available;
/* Provider is dynamic. */
pollfds[0].fd = loc_fd;
pollfds[0].events = POLLIN;
r = poll(pollfds, 1, delay);
if (r < 0) {
- if (errno == EINTR) continue;
- perror("poll");
- fputs(_("Unable to get location"
- " from provider.\n"), stderr);
+ if (errno == EINTR)
+ continue;
+ weprintf("poll:");
+ weprintf(_("Unable to get location from provider.\n"));
return -1;
} else if (r == 0) {
continue;
@@ -803,21 +679,14 @@ run_continual_mode(const struct location_provider *provider,
/* Get new location and availability
information. */
- r = provider->handle(
- location_state, &new_loc,
- &new_available);
- if (r < 0) {
- fputs(_("Unable to get location"
- " from provider.\n"), stderr);
+ if (provider->handle(location_state, &new_loc, &new_available) < 0) {
+ weprintf(_("Unable to get location from provider.\n"));
return -1;
}
- if (!new_available &&
- new_available != location_available) {
- fputs(_("Location is temporarily"
- " unavailable; Using previous"
- " location until it becomes"
- " available...\n"), stderr);
+ if (!new_available && new_available != location_available) {
+ weprintf(_("Location is temporarily unavailable; Using previous"
+ " location until it becomes available...\n"));
}
if (new_available &&
@@ -831,8 +700,7 @@ run_continual_mode(const struct location_provider *provider,
location_available = new_available;
if (!location_is_valid(&loc)) {
- fputs(_("Invalid location returned"
- " from provider.\n"), stderr);
+ weprintf(_("Invalid location returned from provider.\n"));
return -1;
}
} else {
@@ -894,6 +762,8 @@ main(int argc, char *argv[])
int need_location;
int r;
+ argv0 = argv[0];
+
#ifdef ENABLE_NLS
/* Init locale */
setlocale(LC_CTYPE, "");
@@ -930,22 +800,14 @@ main(int argc, char *argv[])
if (options.scheme.dawn.start >= 0 || options.scheme.dawn.end >= 0 ||
options.scheme.dusk.start >= 0 || options.scheme.dusk.end >= 0) {
- if (options.scheme.dawn.start < 0 ||
- options.scheme.dawn.end < 0 ||
- options.scheme.dusk.start < 0 ||
- options.scheme.dusk.end < 0) {
- fputs(_("Partial time-configuration not"
- " supported!\n"), stderr);
- exit(EXIT_FAILURE);
- }
+ if (options.scheme.dawn.start < 0 || options.scheme.dawn.end < 0 ||
+ options.scheme.dusk.start < 0 || options.scheme.dusk.end < 0)
+ eprintf(_("Partial time-configuration not supported!\n"));
if (options.scheme.dawn.start > options.scheme.dawn.end ||
options.scheme.dawn.end > options.scheme.dusk.start ||
- options.scheme.dusk.start > options.scheme.dusk.end) {
- fputs(_("Invalid dawn/dusk time configuration!\n"),
- stderr);
- exit(EXIT_FAILURE);
- }
+ options.scheme.dusk.start > options.scheme.dusk.end)
+ eprintf(_("Invalid dawn/dusk time configuration!\n"));
options.scheme.use_time = 1;
}
@@ -954,17 +816,16 @@ main(int argc, char *argv[])
try all providers until one that works is found. */
/* Location is not needed for reset mode and manual mode. */
- need_location =
- options.mode != PROGRAM_MODE_RESET &&
- options.mode != PROGRAM_MODE_MANUAL &&
- !options.scheme.use_time;
+ need_location = options.mode != PROGRAM_MODE_RESET &&
+ options.mode != PROGRAM_MODE_MANUAL &&
+ !options.scheme.use_time;
if (need_location) {
- if (options.provider != NULL) {
+ if (options.provider) {
/* Use provider specified on command line. */
- r = provider_try_start(
- options.provider, &location_state,
- &config_state, options.provider_args);
- if (r < 0) exit(EXIT_FAILURE);
+ r = provider_try_start(options.provider, &location_state,
+ &config_state, options.provider_args);
+ if (r < 0)
+ exit(EXIT_FAILURE);
} else {
/* Try all providers, use the first that works. */
for (int i = 0;
@@ -1279,14 +1140,12 @@ main(int argc, char *argv[])
}
/* Clean up gamma adjustment state */
- if (options.mode != PROGRAM_MODE_PRINT) {
+ if (options.mode != PROGRAM_MODE_PRINT)
options.method->free(method_state);
- }
/* Clean up location provider state */
- if (need_location) {
+ if (need_location)
options.provider->free(location_state);
- }
return EXIT_SUCCESS;
}
generated by cgit v1.2.3-70-g09d2 (git 2.48.0) at 2025-04-05 08:39:41 +0000