Cleanup and style update (avoid typedef)

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

1 files changed, 25 insertions, 42 deletions

diff --git a/src/gamma-randr.c b/src/gamma-randr.c
index 4a2c907..713139a 100644
--- a/src/gamma-randr.c
+++ b/src/gamma-randr.c
@@ -15,42 +15,25 @@
    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 <stdint.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(s) gettext(s)
-#else
-# define _(s) s
-#endif
+#include "common.h"
 
 #include <xcb/xcb.h>
 #include <xcb/randr.h>
 
-#include "common.h"
-
 
 #define RANDR_VERSION_MAJOR  1
 #define RANDR_VERSION_MINOR  3
 
 
-typedef struct {
+struct randr_crtc_state {
 	xcb_randr_crtc_t crtc;
 	unsigned int ramp_size;
 	uint16_t *saved_ramps;
-} randr_crtc_state_t;
+};
 
-typedef struct {
+struct gamma_state {
 	xcb_connection_t *conn;
 	xcb_screen_t *screen;
 	int preferred_screen;
@@ -58,18 +41,18 @@ typedef struct {
 	int crtc_num_count;
 	int* crtc_num;
 	unsigned int crtc_count;
-	randr_crtc_state_t *crtcs;
-} randr_state_t;
+	struct randr_crtc_state *crtcs;
+};
 
 
 static int
-randr_init(randr_state_t **state)
+randr_init(struct gamma_state **state)
 {
 	/* Initialize state. */
-	*state = malloc(sizeof(randr_state_t));
+	*state = malloc(sizeof(struct gamma_state));
 	if (*state == NULL) return -1;
 
-	randr_state_t *s = *state;
+	struct gamma_state *s = *state;
 	s->screen_num = -1;
 	s->crtc_num = NULL;
 
@@ -116,7 +99,7 @@ randr_init(randr_state_t **state)
 }
 
 static int
-randr_start(randr_state_t *state, program_mode_t mode)
+randr_start(struct gamma_state *state, enum program_mode mode)
 {
 	xcb_generic_error_t *error;
 
@@ -159,7 +142,7 @@ randr_start(randr_state_t *state, program_mode_t mode)
 	}
 
 	state->crtc_count = res_reply->num_crtcs;
-	state->crtcs = calloc(state->crtc_count, sizeof(randr_crtc_state_t));
+	state->crtcs = calloc(state->crtc_count, sizeof(struct randr_crtc_state));
 	if (state->crtcs == NULL) {
 		perror("malloc");
 		state->crtc_count = 0;
@@ -253,7 +236,7 @@ randr_start(randr_state_t *state, program_mode_t mode)
 }
 
 static void
-randr_restore(randr_state_t *state)
+randr_restore(struct gamma_state *state)
 {
 	xcb_generic_error_t *error;
 
@@ -282,7 +265,7 @@ randr_restore(randr_state_t *state)
 }
 
 static void
-randr_free(randr_state_t *state)
+randr_free(struct gamma_state *state)
 {
 	/* Free CRTC state */
 	for (int i = 0; i < state->crtc_count; i++) {
@@ -313,7 +296,7 @@ randr_print_help(FILE *f)
 }
 
 static int
-randr_set_option(randr_state_t *state, const char *key, const char *value)
+randr_set_option(struct gamma_state *state, const char *key, const char *value)
 {
 	if (strcasecmp(key, "screen") == 0) {
 		state->screen_num = atoi(value);
@@ -377,7 +360,7 @@ randr_set_option(randr_state_t *state, const char *key, const char *value)
 
 static int
 randr_set_temperature_for_crtc(
-	randr_state_t *state, int crtc_num, const color_setting_t *setting,
+	struct gamma_state *state, int crtc_num, const struct color_setting *setting,
 	int preserve)
 {
 	xcb_generic_error_t *error;
@@ -447,7 +430,7 @@ randr_set_temperature_for_crtc(
 
 static int
 randr_set_temperature(
-	randr_state_t *state, const color_setting_t *setting, int preserve)
+	struct gamma_state *state, const struct color_setting *setting, int preserve)
 {
 	int r;
 
@@ -471,13 +454,13 @@ randr_set_temperature(
 }
 
 
-const gamma_method_t randr_gamma_method = {
+const struct gamma_method randr_gamma_method = {
 	"randr", 1,
-	(gamma_method_init_func *)randr_init,
-	(gamma_method_start_func *)randr_start,
-	(gamma_method_free_func *)randr_free,
-	(gamma_method_print_help_func *)randr_print_help,
-	(gamma_method_set_option_func *)randr_set_option,
-	(gamma_method_restore_func *)randr_restore,
-	(gamma_method_set_temperature_func *)randr_set_temperature
+	&randr_init,
+	&randr_start,
+	&randr_free,
+	&randr_print_help,
+	&randr_set_option,
+	&randr_restore,
+	&randr_set_temperature
 };