Cleanup and style update (avoid typedef)

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

1 files changed, 14 insertions, 26 deletions

diff --git a/src/gamma-dummy.c b/src/gamma-dummy.c
index 066ae96..d87c2dd 100644
--- a/src/gamma-dummy.c
+++ b/src/gamma-dummy.c
@@ -16,42 +16,30 @@
 
    Copyright (c) 2013-2017  Jon Lund Steffensen <jonlst@gmail.com>
 */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(s) gettext(s)
-#else
-# define _(s) s
-#endif
-
 #include "common.h"
 
 
 static int
-gamma_dummy_init(void **state)
+gamma_dummy_init(struct gamma_state **state)
 {
 	*state = NULL;
 	return 0;
 }
 
 static int
-gamma_dummy_start(void *state, program_mode_t mode)
+gamma_dummy_start(struct gamma_state *state, enum program_mode mode)
 {
 	fputs(_("WARNING: Using dummy gamma method! Display will not be affected by this gamma method.\n"), stderr);
 	return 0;
 }
 
 static void
-gamma_dummy_restore(void *state)
+gamma_dummy_restore(struct gamma_state *state)
 {
 }
 
 static void
-gamma_dummy_free(void *state)
+gamma_dummy_free(struct gamma_state *state)
 {
 }
 
@@ -63,7 +51,7 @@ gamma_dummy_print_help(FILE *f)
 }
 
 static int
-gamma_dummy_set_option(void *state, const char *key, const char *value)
+gamma_dummy_set_option(struct gamma_state *state, const char *key, const char *value)
 {
 	fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key);
 	return -1;
@@ -71,20 +59,20 @@ gamma_dummy_set_option(void *state, const char *key, const char *value)
 
 static int
 gamma_dummy_set_temperature(
-	void *state, const color_setting_t *setting, int preserve)
+	struct gamma_state *state, const struct color_setting *setting, int preserve)
 {
 	printf(_("Temperature: %i\n"), setting->temperature);
 	return 0;
 }
 
 
-const gamma_method_t dummy_gamma_method = {
+const struct gamma_method dummy_gamma_method = {
 	"dummy", 0,
-	(gamma_method_init_func *)gamma_dummy_init,
-	(gamma_method_start_func *)gamma_dummy_start,
-	(gamma_method_free_func *)gamma_dummy_free,
-	(gamma_method_print_help_func *)gamma_dummy_print_help,
-	(gamma_method_set_option_func *)gamma_dummy_set_option,
-	(gamma_method_restore_func *)gamma_dummy_restore,
-	(gamma_method_set_temperature_func *)gamma_dummy_set_temperature
+	&gamma_dummy_init,
+	&gamma_dummy_start,
+	&gamma_dummy_free,
+	&gamma_dummy_print_help,
+	&gamma_dummy_set_option,
+	&gamma_dummy_restore,
+	&gamma_dummy_set_temperature
 };