From c8b400cee211fd2ff7bcc69c459cda7bedfe8fdc Mon Sep 17 00:00:00 2001
From: Mattias Andrée <m@maandree.se>
Date: Fri, 7 Mar 2025 21:33:23 +0100
Subject: misc minor improvements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <m@maandree.se>
---
 src/common.h   | 23 +++++++++++++++++++++++
 src/redshift.c | 41 ++++++++++-------------------------------
 2 files changed, 33 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/common.h b/src/common.h
index 37f56f0..3548d5c 100644
--- a/src/common.h
+++ b/src/common.h
@@ -78,6 +78,18 @@
 #define NEUTRAL_TEMP  6500
 
 
+/**
+ * Truncate a value into a bounded range
+ * 
+ * @param   LO  The lower bound
+ * @param   X   The value to truncated
+ * @param   UP  The upper bound
+ * @return      `X` truncated such that it is at least `LO` and at most `UP`
+ */
+#define CLAMP(LO, X, UP)  (((LO) > (X)) ? (LO) : (((X) < (UP)) ? (X) : (UP)))
+
+
+
 enum period {
 	PERIOD_NONE = 0,
 	PERIOD_DAYTIME,
@@ -301,9 +313,20 @@ void pipeutils_signal(int write_fd);
 void pipeutils_handle_signal(int read_fd);
 
 
+/**
+ * Set to 1 once the process has received a signal to terminate
+ */
 extern volatile sig_atomic_t exiting;
+
+/**
+ * Set to 1 once the process has received a signal to remove its effect
+ */
 extern volatile sig_atomic_t disable;
 
+
+/**
+ * Install signal handlers for the process
+ */
 void signals_install_handlers(void);
 
 
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:
-- 
cgit v1.2.3-70-g09d2