diff options
Diffstat (limited to 'src/redshift.c')
| -rw-r--r-- | src/redshift.c | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/src/redshift.c b/src/redshift.c index ae92c86..1fb950d 100644 --- a/src/redshift.c +++ b/src/redshift.c @@ -35,15 +35,6 @@ struct pollfd { int poll(struct pollfd *fds, int nfds, int timeout) { abort(); return -1; } #endif -/* pause() is not defined on windows platform but is not needed either. - * Use a noop macro instead. */ -#ifdef WINDOWS -# define pause() -#endif - -#undef CLAMP -#define CLAMP(LO, MID, UP) (((LO) > (MID)) ? (LO) : (((MID) < (UP)) ? (MID) : (UP))) - /* Bounds for parameters. */ #define MIN_LAT -90.0 @@ -645,7 +636,7 @@ run_continual_mode(const struct location_provider *provider, continue; weprintf("poll:"); eprintf(_("Unable to get location from provider.")); - } else if (r == 0) { + } else if (!r) { continue; } @@ -735,21 +726,12 @@ main(int argc, char *argv[]) argv0 = argv[0]; #ifdef ENABLE_NLS - /* Init locale */ setlocale(LC_CTYPE, ""); setlocale(LC_MESSAGES, ""); - - /* Internationalisation */ bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); #endif - /* Flush messages consistently even if redirected to a pipe or - file. Change the flush behaviour to line-buffered, without - changing the actual buffers being used. */ - setvbuf(stdout, NULL, _IOLBF, 0); - setvbuf(stderr, NULL, _IOLBF, 0); - options_init(&options); options_parse_args(&options, argc, argv, gamma_methods, location_providers); @@ -811,8 +793,7 @@ main(int argc, char *argv[]) /* Solar elevations */ if (options.scheme.high < options.scheme.low) { - weprintf(_("High transition elevation cannot be lower than the low transition elevation.")); - exit(EXIT_FAILURE); + eprintf(_("High transition elevation cannot be lower than the low transition elevation.")); } if (options.verbose) { @@ -855,10 +836,8 @@ main(int argc, char *argv[]) /* Gamma */ if (!gamma_is_valid(options.scheme.day.gamma) || - !gamma_is_valid(options.scheme.night.gamma)) { - weprintf(_("Gamma value must be between %.1f and %.1f."), MIN_GAMMA, MAX_GAMMA); - exit(EXIT_FAILURE); - } + !gamma_is_valid(options.scheme.night.gamma)) + eprintf(_("Gamma value must be between %.1f and %.1f."), MIN_GAMMA, MAX_GAMMA); if (options.verbose) { /* TRANSLATORS: The string in parenthesis is either @@ -959,18 +938,18 @@ main(int argc, char *argv[]) break; apply: - if (options.method->set_temperature(method_state, &color, options.preserve_gamma) < 0) { - weprintf(_("Temperature adjustment failed.")); - options.method->free(method_state); - exit(1); - } + if (options.method->set_temperature(method_state, &color, options.preserve_gamma) < 0) + eprintf(_("Temperature adjustment failed.")); +#ifndef WINDOWS /* In Quartz (OSX) the gamma adjustments will automatically revert when * the process exits. Therefore, we have to loop until CTRL-C is received. */ if (!strcmp(options.method->name, "quartz")) { weprintf(_("Press ctrl-c to stop...")); - pause(); + while (!exiting) + pause(); } +#endif break; case PROGRAM_MODE_MANUAL: |