Cleanup and style update (avoid typedef)

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 20 insertions, 35 deletions

diff --git a/src/gamma-w32gdi.c b/src/gamma-w32gdi.c
index da5461e..87568f9 100644
--- a/src/gamma-w32gdi.c
+++ b/src/gamma-w32gdi.c
@@ -15,14 +15,9 @@
    along with Redshift.  If not, see <http://www.gnu.org/licenses/>.
 
    Copyright (c) 2010-2017  Jon Lund Steffensen <jonlst@gmail.com>
+   Copyright (c) 2025       Mattias Andrée <m@maandree.se>
 */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
+#include "common.h"
 
 #ifndef WINVER
 # define WINVER  0x0500
@@ -30,39 +25,29 @@
 #include <windows.h>
 #include <wingdi.h>
 
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(s) gettext(s)
-#else
-# define _(s) s
-#endif
-
-#include "gamma-w32gdi.h"
-#include "colorramp.h"
-
 #define GAMMA_RAMP_SIZE  256
 #define MAX_ATTEMPTS  10
 
 
-typedef struct {
+struct gamma_state {
 	WORD *saved_ramps;
-} w32gdi_state_t;
+};
 
 
 static int
-w32gdi_init(w32gdi_state_t **state)
+w32gdi_init(struct gamma_state **state)
 {
-	*state = malloc(sizeof(w32gdi_state_t));
+	*state = malloc(sizeof(struct gamma_state));
 	if (state == NULL) return -1;
 
-	w32gdi_state_t *s = *state;
+	struct gamma_state *s = *state;
 	s->saved_ramps = NULL;
 
 	return 0;
 }
 
 static int
-w32gdi_start(w32gdi_state_t *state, program_mode_t mode)
+w32gdi_start(struct gamma_state *state, program_mode_t mode)
 {
 	BOOL r;
 
@@ -104,7 +89,7 @@ w32gdi_start(w32gdi_state_t *state, program_mode_t mode)
 }
 
 static void
-w32gdi_free(w32gdi_state_t *state)
+w32gdi_free(struct gamma_state *state)
 {
 	/* Free saved ramps */
 	free(state->saved_ramps);
@@ -121,7 +106,7 @@ w32gdi_print_help(FILE *f)
 }
 
 static int
-w32gdi_set_option(w32gdi_state_t *state, const char *key, const char *value)
+w32gdi_set_option(struct gamma_state *state, const char *key, const char *value)
 {
 	if (strcasecmp(key, "preserve") == 0) {
 		fprintf(stderr, _("Parameter `%s` is now always on; "
@@ -137,7 +122,7 @@ w32gdi_set_option(w32gdi_state_t *state, const char *key, const char *value)
 }
 
 static void
-w32gdi_restore(w32gdi_state_t *state)
+w32gdi_restore(struct gamma_state *state)
 {
 	/* Open device context */
 	HDC hDC = GetDC(NULL);
@@ -162,7 +147,7 @@ w32gdi_restore(w32gdi_state_t *state)
 
 static int
 w32gdi_set_temperature(
-	w32gdi_state_t *state, const color_setting_t *setting, int preserve)
+	struct gamma_state *state, const color_setting_t *setting, int preserve)
 {
 	BOOL r;
 
@@ -227,13 +212,13 @@ w32gdi_set_temperature(
 }
 
 
-const gamma_method_t w32gdi_gamma_method = {
+const struct gamma_method w32gdi_gamma_method = {
 	"wingdi", 1,
-	(gamma_method_init_func *)w32gdi_init,
-	(gamma_method_start_func *)w32gdi_start,
-	(gamma_method_free_func *)w32gdi_free,
-	(gamma_method_print_help_func *)w32gdi_print_help,
-	(gamma_method_set_option_func *)w32gdi_set_option,
-	(gamma_method_restore_func *)w32gdi_restore,
-	(gamma_method_set_temperature_func *)w32gdi_set_temperature
+	&w32gdi_init,
+	&w32gdi_start,
+	&w32gdi_free,
+	&w32gdi_print_help,
+	&w32gdi_set_option,
+	&w32gdi_restore,
+	&w32gdi_set_temperature
 };