style and some minor fixes

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

1 files changed, 14 insertions, 15 deletions

diff --git a/src/gamma-randr.c b/src/gamma-randr.c
index c8ea754..214acab 100644
--- a/src/gamma-randr.c
+++ b/src/gamma-randr.c
@@ -55,10 +55,10 @@ randr_init(struct gamma_state **state)
 	xcb_randr_query_version_reply_t *ver_reply;
 	xcb_generic_error_t *error;
 	struct gamma_state *s;
+	int ec;
 
 	/* Initialize state. */
-	*state = malloc(sizeof(**state));
-	if (*state == NULL) return -1;
+	*state = emalloc(sizeof(**state));
 
 	s = *state;
 	s->screen_num = -1;
@@ -78,8 +78,8 @@ randr_init(struct gamma_state **state)
 	/* TODO What does it mean when both error and ver_reply is NULL?
 	   Apparently, we have to check both to avoid seg faults. */
 	if (error || ver_reply == NULL) {
-		int ec = (error != 0) ? error->error_code : -1;
-		weprintf(_("`%s' returned error %d\n"), "RANDR Query Version", ec);
+		ec = (error != 0) ? error->error_code : -1;
+		weprintf(_("`%s' returned error %i\n"), "RANDR Query Version", ec);
 		xcb_disconnect(s->conn);
 		free(s);
 		return -1;
@@ -140,7 +140,7 @@ randr_start(struct gamma_state *state, enum program_mode mode)
 	res_reply = xcb_randr_get_screen_resources_current_reply(state->conn, res_cookie, &error);
 
 	if (error) {
-		weprintf(_("`%s' returned error %d\n"), "RANDR Get Screen Resources Current", error->error_code);
+		weprintf(_("`%s' returned error %i\n"), "RANDR Get Screen Resources Current", error->error_code);
 		return -1;
 	}
 
@@ -172,7 +172,7 @@ randr_start(struct gamma_state *state, enum program_mode mode)
 		gamma_size_reply = xcb_randr_get_crtc_gamma_size_reply(state->conn, gamma_size_cookie, &error);
 
 		if (error) {
-			weprintf(_("`%s' returned error %d\n"), "RANDR Get CRTC Gamma Size", error->error_code);
+			weprintf(_("`%s' returned error %i\n"), "RANDR Get CRTC Gamma Size", error->error_code);
 			return -1;
 		}
 
@@ -182,7 +182,7 @@ randr_start(struct gamma_state *state, enum program_mode mode)
 		free(gamma_size_reply);
 
 		if (ramp_size == 0) {
-			weprintf(_("Gamma ramp size too small: %i\n"), ramp_size);
+			weprintf(_("Gamma ramp size too small: %i"), ramp_size);
 			return -1;
 		}
 
@@ -191,7 +191,7 @@ randr_start(struct gamma_state *state, enum program_mode mode)
 		gamma_get_reply = xcb_randr_get_crtc_gamma_reply(state->conn, gamma_get_cookie, &error);
 
 		if (error) {
-			weprintf(_("`%s' returned error %d\n"), "RANDR Get CRTC Gamma", error->error_code);
+			weprintf(_("`%s' returned error %i\n"), "RANDR Get CRTC Gamma", error->error_code);
 			return -1;
 		}
 
@@ -236,7 +236,7 @@ randr_restore(struct gamma_state *state)
 		error = xcb_request_check(state->conn, gamma_set_cookie);
 
 		if (error) {
-			weprintf(_("`%s' returned error %d\n"), "RANDR Set CRTC Gamma", error->error_code);
+			weprintf(_("`%s' returned error %i\n"), "RANDR Set CRTC Gamma", error->error_code);
 			weprintf(_("Unable to restore CRTC %i\n"), i);
 		}
 	}
@@ -318,10 +318,9 @@ randr_set_option(struct gamma_state *state, const char *key, const char *value)
 				break;
 		}
 	} else if (strcasecmp(key, "preserve") == 0) {
-		weprintf(_("Parameter `%s` is now always on;  Use the `%s`"
-		           " command-line option to disable.\n"), key, "-P");
+		weprintf(_("Parameter `%s' is now always on; use the `%s' command-line option to disable."), key, "-P");
 	} else {
-		weprintf(_("Unknown method parameter: `%s'.\n"), key);
+		weprintf(_("Unknown method parameter: `%s'."), key);
 		return -1;
 	}
 
@@ -339,9 +338,9 @@ randr_set_temperature_for_crtc(struct gamma_state *state, int crtc_num,
 	uint16_t *gamma_ramps, *gamma_r, *gamma_g, *gamma_b, value;
 
 	if (crtc_num >= state->crtc_count || crtc_num < 0) {
-		fprintf(stderr, _("CRTC %d does not exist. "), crtc_num);
+		fprintf(stderr, _("CRTC %i does not exist. "), crtc_num);
 		if (state->crtc_count > 1)
-			fprintf(stderr, _("Valid CRTCs are [0-%d].\n"), state->crtc_count-1);
+			fprintf(stderr, _("Valid CRTCs are [0-%i].\n"), state->crtc_count-1);
 		else
 			fprintf(stderr, _("Only CRTC 0 exists.\n"));
 
@@ -381,7 +380,7 @@ randr_set_temperature_for_crtc(struct gamma_state *state, int crtc_num,
 	error = xcb_request_check(state->conn, gamma_set_cookie);
 
 	if (error) {
-		weprintf(_("`%s' returned error %d\n"), "RANDR Set CRTC Gamma", error->error_code);
+		weprintf(_("`%s' returned error %i\n"), "RANDR Set CRTC Gamma", error->error_code);
 		free(gamma_ramps);
 		return -1;
 	}