1 files changed, 90 insertions, 71 deletions

diff --git a/src/redshift.c b/src/redshift.c
index be97912..bbbb30b 100644
--- a/src/redshift.c
+++ b/src/redshift.c
@@ -256,7 +256,9 @@ provider_try_start(const struct location_provider *provider,
 		   LOCATION_STATE **state, struct config_ini_state *config,
 		   char *args)
 {
-	int r;
+	const char *manual_keys[] = { "lat", "lon" };
+	struct config_ini_section *section;
+	int r, i;
 
 	r = provider->init(state);
 	if (r < 0) {
@@ -266,8 +268,7 @@ provider_try_start(const struct location_provider *provider,
 	}
 
 	/* Set provider options from config file. */
-	struct config_ini_section *section =
-		config_ini_get_section(config, provider->name);
+	section = config_ini_get_section(config, provider->name);
 	if (section != NULL) {
 		struct config_ini_setting *setting = section->settings;
 		while (setting != NULL) {
@@ -290,14 +291,17 @@ provider_try_start(const struct location_provider *provider,
 	}
 
 	/* Set provider options from command line. */
-	const char *manual_keys[] = { "lat", "lon" };
-	int i = 0;
+	i = 0;
 	while (args != NULL) {
-		char *next_arg = strchr(args, ':');
+		char *next_arg;
+		const char *key;
+		char *value;
+
+		next_arg = strchr(args, ':');
 		if (next_arg != NULL) *(next_arg++) = '\0';
 
-		const char *key = args;
-		char *value = strchr(args, '=');
+		key = args;
+		value = strchr(args, '=');
 		if (value == NULL) {
 			/* The options for the "manual" method can be set
 			   without keys on the command line for convencience
@@ -347,6 +351,7 @@ static int
 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;
 
 	r = method->init(state);
@@ -357,8 +362,7 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
 	}
 
 	/* Set method options from config file. */
-	struct config_ini_section *section =
-		config_ini_get_section(config, method->name);
+	section = config_ini_get_section(config, method->name);
 	if (section != NULL) {
 		struct config_ini_setting *setting = section->settings;
 		while (setting != NULL) {
@@ -382,11 +386,15 @@ method_try_start(const struct gamma_method *method, GAMMA_STATE **state,
 
 	/* Set method options from command line. */
 	while (args != NULL) {
-		char *next_arg = strchr(args, ':');
+		char *next_arg;
+		const char *key;
+		char *value;
+
+		next_arg = strchr(args, ':');
 		if (next_arg != NULL) *(next_arg++) = '\0';
 
-		const char *key = args;
-		char *value = strchr(args, '=');
+		key = args;
+		value = strchr(args, '=');
 		if (value == NULL) {
 			fprintf(stderr, _("Failed to parse option `%s'.\n"),
 				args);
@@ -472,10 +480,13 @@ provider_get_location(
 	while (!available) {
 		int loc_fd = provider->get_fd(state);
 		if (loc_fd >= 0) {
+			double now;
+			double later;
+			int r;
+
 			/* Provider is dynamic. */
 			/* TODO: This should use a monotonic time source. */
-			double now;
-			int r = systemtime_get_time(&now);
+			r = systemtime_get_time(&now);
 			if (r < 0) {
 				fputs(_("Unable to read system time.\n"),
 				      stderr);
@@ -493,7 +504,6 @@ provider_get_location(
 				return 0;
 			}
 
-			double later;
 			r = systemtime_get_time(&later);
 			if (r < 0) {
 				fputs(_("Unable to read system time.\n"),
@@ -509,8 +519,8 @@ provider_get_location(
 		}
 
 
-		int r = provider->handle(state, loc, &available);
-		if (r < 0) return -1;
+		if (provider->handle(state, loc, &available) < 0)
+			return -1;
 	}
 
 	return 1;
@@ -542,30 +552,37 @@ run_continual_mode(const struct location_provider *provider,
 {
 	int r;
 
+	int done = 0;
+	int prev_disabled = 1;
+	int disabled = 0;
+	int location_available = 1;
+	struct color_setting fade_start_interp;
+	struct color_setting prev_target_interp;
+	struct color_setting interp;
+	struct location loc;
+	int need_location;
+
 	/* Short fade parameters */
 	int fade_length = 0;
 	int fade_time = 0;
-	struct color_setting fade_start_interp;
+
+	/* Save previous parameters so we can avoid printing status updates if
+	   the values did not change. */
+	enum period prev_period = PERIOD_NONE;
 
 	r = signals_install_handlers();
 	if (r < 0) {
 		return r;
 	}
 
-	/* Save previous parameters so we can avoid printing status updates if
-	   the values did not change. */
-	enum period prev_period = PERIOD_NONE;
-
 	/* Previous target color setting and current actual color setting.
 	   Actual color setting takes into account the current color fade. */
-	struct color_setting prev_target_interp;
 	color_setting_reset(&prev_target_interp);
 
-	struct color_setting interp;
 	color_setting_reset(&interp);
 
-	struct location loc = { NAN, NAN };
-	int need_location = !scheme->use_time;
+	loc = (struct location){ NAN, NAN };
+	need_location = !scheme->use_time;
 	if (need_location) {
 		fputs(_("Waiting for initial location"
 			" to become available...\n"), stderr);
@@ -593,11 +610,13 @@ run_continual_mode(const struct location_provider *provider,
 	}
 
 	/* Continuously adjust color temperature */
-	int done = 0;
-	int prev_disabled = 1;
-	int disabled = 0;
-	int location_available = 1;
-	while (1) {
+	for (;;) {
+		double now;
+		enum period period;
+		double transition_prog;
+		struct color_setting target_interp;
+		int delay, loc_fd;
+
 		/* Check to see if disable signal was caught */
 		if (disable && !done) {
 			disabled = !disabled;
@@ -625,15 +644,12 @@ run_continual_mode(const struct location_provider *provider,
 		prev_disabled = disabled;
 
 		/* Read timestamp */
-		double now;
 		r = systemtime_get_time(&now);
 		if (r < 0) {
 			fputs(_("Unable to read system time.\n"), stderr);
 			return -1;
 		}
 
-		enum period period;
-		double transition_prog;
 		if (scheme->use_time) {
 			int time_offset = get_seconds_since_midnight(now);
 
@@ -653,7 +669,6 @@ run_continual_mode(const struct location_provider *provider,
 
 		/* Use transition progress to get target color
 		   temperature. */
-		struct color_setting target_interp;
 		interpolate_transition_scheme(
 			scheme, transition_prog, &target_interp);
 
@@ -699,8 +714,7 @@ run_continual_mode(const struct location_provider *provider,
 
 		/* Handle ongoing fade */
 		if (fade_length != 0) {
-			fade_time += 1;
-			double frac = fade_time / (double)fade_length;
+			double frac = ++fade_time / (double)fade_length;
 			double alpha = CLAMP(0.0, ease_fade(frac), 1.0);
 
 			interpolate_color_settings(
@@ -745,23 +759,26 @@ run_continual_mode(const struct location_provider *provider,
 		prev_target_interp = target_interp;
 
 		/* Sleep length depends on whether a fade is ongoing. */
-		int delay = SLEEP_DURATION;
+		delay = SLEEP_DURATION;
 		if (fade_length != 0) {
 			delay = SLEEP_DURATION_SHORT;
 		}
 
 		/* Update location. */
-		int loc_fd = -1;
+		loc_fd = -1;
 		if (need_location) {
 			loc_fd = provider->get_fd(location_state);
 		}
 
 		if (loc_fd >= 0) {
-			/* Provider is dynamic. */
 			struct pollfd pollfds[1];
+			struct location new_loc;
+			int r, new_available;
+
+			/* Provider is dynamic. */
 			pollfds[0].fd = loc_fd;
 			pollfds[0].events = POLLIN;
-			int r = poll(pollfds, 1, delay);
+			r = poll(pollfds, 1, delay);
 			if (r < 0) {
 				if (errno == EINTR) continue;
 				perror("poll");
@@ -774,8 +791,6 @@ run_continual_mode(const struct location_provider *provider,
 
 			/* Get new location and availability
 			   information. */
-			struct location new_loc;
-			int new_available;
 			r = provider->handle(
 				location_state, &new_loc,
 				&new_available);
@@ -823,18 +838,6 @@ run_continual_mode(const struct location_provider *provider,
 int
 main(int argc, char *argv[])
 {
-	int r;
-
-#ifdef ENABLE_NLS
-	/* Init locale */
-	setlocale(LC_CTYPE, "");
-	setlocale(LC_MESSAGES, "");
-
-	/* Internationalisation */
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-#endif
-
 	/* List of gamma methods. */
 	const struct gamma_method gamma_methods[] = {
 #ifdef ENABLE_COOPGAMMA
@@ -871,19 +874,35 @@ main(int argc, char *argv[])
 		{ NULL }
 	};
 
+	struct options options;
+	struct config_ini_state config_state;
+	struct transition_scheme *scheme;
+	GAMMA_STATE *method_state;
+	LOCATION_STATE *location_state;
+	int need_location;
+	int r;
+
+#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);
 
-	struct options options;
 	options_init(&options);
 	options_parse_args(
 		&options, argc, argv, gamma_methods, location_providers);
 
 	/* Load settings from config file. */
-	struct config_ini_state config_state;
 	r = config_ini_init(&config_state, options.config_filepath);
 	if (r < 0) {
 		fputs("Unable to load config file.\n", stderr);
@@ -921,10 +940,9 @@ main(int argc, char *argv[])
 
 	/* Initialize location provider if needed. If provider is NULL
 	   try all providers until one that works is found. */
-	LOCATION_STATE *location_state;
 
 	/* Location is not needed for reset mode and manual mode. */
-	int need_location =
+	need_location =
 		options.mode != PROGRAM_MODE_RESET &&
 		options.mode != PROGRAM_MODE_MANUAL &&
 		!options.scheme.use_time;
@@ -1052,11 +1070,10 @@ main(int argc, char *argv[])
 		       options.scheme.night.gamma[2]);
 	}
 
-	struct transition_scheme *scheme = &options.scheme;
+	scheme = &options.scheme;
 
 	/* Initialize gamma adjustment method. If method is NULL
 	   try all methods until one that works is found. */
-	GAMMA_STATE *method_state;
 
 	/* Gamma adjustment not needed for print mode */
 	if (options.mode != PROGRAM_MODE_PRINT) {
@@ -1068,7 +1085,8 @@ main(int argc, char *argv[])
 			if (r < 0) exit(EXIT_FAILURE);
 		} else {
 			/* Try all methods, use the first that works. */
-			for (int i = 0; gamma_methods[i].name != NULL; i++) {
+			int i;
+			for (i = 0; gamma_methods[i].name != NULL; i++) {
 				const struct gamma_method *m = &gamma_methods[i];
 				if (!m->autostart) continue;
 
@@ -1100,14 +1118,17 @@ main(int argc, char *argv[])
 	case PROGRAM_MODE_PRINT:
 	{
 		struct location loc = { NAN, NAN };
+		double now;
+		enum period period;
+		double transition_prog;
+		struct color_setting interp;
+
 		if (need_location) {
 			fputs(_("Waiting for current location"
 				" to become available...\n"), stderr);
 
 			/* Wait for location provider. */
-			int r = provider_get_location(
-				options.provider, location_state, -1, &loc);
-			if (r < 0) {
+			if (provider_get_location(options.provider, location_state, -1, &loc) < 0) {
 				fputs(_("Unable to get location"
 					" from provider.\n"), stderr);
 				exit(EXIT_FAILURE);
@@ -1120,7 +1141,6 @@ main(int argc, char *argv[])
 			print_location(&loc);
 		}
 
-		double now;
 		r = systemtime_get_time(&now);
 		if (r < 0) {
 			fputs(_("Unable to read system time.\n"), stderr);
@@ -1128,8 +1148,6 @@ main(int argc, char *argv[])
 			exit(EXIT_FAILURE);
 		}
 
-		enum period period;
-		double transition_prog;
 		if (options.scheme.use_time) {
 			int time_offset = get_seconds_since_midnight(now);
 			period = get_period_from_time(scheme, time_offset);
@@ -1152,7 +1170,6 @@ main(int argc, char *argv[])
 		}
 
 		/* Use transition progress to set color temperature */
-		struct color_setting interp;
 		interpolate_transition_scheme(
 			scheme, transition_prog, &interp);
 
@@ -1188,13 +1205,15 @@ main(int argc, char *argv[])
 	break;
 	case PROGRAM_MODE_MANUAL:
 	{
+		struct color_setting manual;
+
 		if (options.verbose) {
 			printf(_("Color temperature: %uK\n"),
 			       options.temp_set);
 		}
 
 		/* Adjust temperature */
-		struct color_setting manual = scheme->day;
+		manual = scheme->day;
 		manual.temperature = options.temp_set;
 		r = options.method->set_temperature(
 			method_state, &manual, options.preserve_gamma);