1 files changed, 18 insertions, 24 deletions

diff --git a/src/gamma-randr.c b/src/gamma-randr.c
index bb4e5a0..fcb02de 100644
--- a/src/gamma-randr.c
+++ b/src/gamma-randr.c
@@ -79,7 +79,7 @@ randr_init(struct gamma_state **state)
 	   Apparently, we have to check both to avoid seg faults. */
 	if (error || ver_reply == NULL) {
 		ec = (error != 0) ? error->error_code : -1;
-		weprintf(_("`%s' returned error %i\n"), "RANDR Query Version", ec);
+		weprintf(_("`%s' returned error %i."), "RANDR Query Version", ec);
 		xcb_disconnect(s->conn);
 		free(s);
 		return -1;
@@ -87,8 +87,7 @@ randr_init(struct gamma_state **state)
 
 	if (ver_reply->major_version != RANDR_VERSION_MAJOR ||
 	    ver_reply->minor_version < RANDR_VERSION_MINOR) {
-		weprintf(_("Unsupported RANDR version (%u.%u)\n"),
-		         ver_reply->major_version, ver_reply->minor_version);
+		weprintf(_("Unsupported RANDR version (%u.%u)."), ver_reply->major_version, ver_reply->minor_version);
 		free(ver_reply);
 		xcb_disconnect(s->conn);
 		free(s);
@@ -131,7 +130,7 @@ randr_start(struct gamma_state *state, enum program_mode mode)
 	}
 
 	if (!state->screen) {
-		weprintf(_("Screen %i could not be found.\n"), screen_num);
+		weprintf(_("Screen %i could not be found."), screen_num);
 		return -1;
 	}
 
@@ -140,7 +139,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 %i\n"), "RANDR Get Screen Resources Current", error->error_code);
+		weprintf(_("`%s' returned error %i."), "RANDR Get Screen Resources Current", error->error_code);
 		return -1;
 	}
 
@@ -172,7 +171,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 %i\n"), "RANDR Get CRTC Gamma Size", error->error_code);
+			weprintf(_("`%s' returned error %i."), "RANDR Get CRTC Gamma Size", error->error_code);
 			return -1;
 		}
 
@@ -191,7 +190,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 %i\n"), "RANDR Get CRTC Gamma", error->error_code);
+			weprintf(_("`%s' returned error %i."), "RANDR Get CRTC Gamma", error->error_code);
 			return -1;
 		}
 
@@ -236,8 +235,8 @@ randr_restore(struct gamma_state *state)
 		error = xcb_request_check(state->conn, gamma_set_cookie);
 
 		if (error) {
-			weprintf(_("`%s' returned error %i\n"), "RANDR Set CRTC Gamma", error->error_code);
-			weprintf(_("Unable to restore CRTC %i\n"), i);
+			weprintf(_("`%s' returned error %i."), "RANDR Set CRTC Gamma", error->error_code);
+			weprintf(_("Unable to restore CRTC %i."), i);
 		}
 	}
 }
@@ -288,8 +287,8 @@ randr_set_option(struct gamma_state *state, const char *key, const char *value)
 		for (;;) {
 			errno = 0;
 			parsed = strtol(local_value, &tail, 0);
-			if (parsed == 0 && (errno != 0 || tail == local_value)) {
-				weprintf(_("Unable to read screen number: `%s'.\n"), value);
+			if (!parsed && (errno || tail == local_value)) {
+				weprintf(_("Unable to read screen number: `%s'."), value);
 				return -1;
 			}
 			state->crtc_num_count += 1;
@@ -338,11 +337,10 @@ 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 %i does not exist. "), crtc_num);
 		if (state->crtc_count > 1)
-			fprintf(stderr, _("Valid CRTCs are [0-%i].\n"), state->crtc_count-1);
+			weprintf(_("CRTC %i does not exist, valid CRTCs are [0-%i]."), crtc_num, state->crtc_count-1);
 		else
-			fprintf(stderr, _("Only CRTC 0 exists.\n"));
+			weprintf(_("CRTC %i does not exist, only CRTC 0 exists."), crtc_num);
 
 		return -1;
 	}
@@ -380,7 +378,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 %i\n"), "RANDR Set CRTC Gamma", error->error_code);
+		weprintf(_("`%s' returned error %i."), "RANDR Set CRTC Gamma", error->error_code);
 		free(gamma_ramps);
 		return -1;
 	}
@@ -393,21 +391,17 @@ randr_set_temperature_for_crtc(struct gamma_state *state, int crtc_num,
 static int
 randr_set_temperature(struct gamma_state *state, const struct color_setting *setting, int preserve)
 {
-	int i, r;
+	int i;
 
 	/* If no CRTC numbers have been specified, set temperature on all CRTCs. */
 	if (!state->crtc_num_count) {
-		for (i = 0; i < state->crtc_count; i++) {
-			r = randr_set_temperature_for_crtc(state, i, setting, preserve);
-			if (r < 0)
+		for (i = 0; i < state->crtc_count; i++)
+			if (randr_set_temperature_for_crtc(state, i, setting, preserve) < 0)
 				return -1;
-		}
 	} else {
-		for (i = 0; i < state->crtc_num_count; ++i) {
-			r = randr_set_temperature_for_crtc(state, state->crtc_num[i], setting, preserve);
-			if (r < 0)
+		for (i = 0; i < state->crtc_num_count; ++i)
+			if (randr_set_temperature_for_crtc(state, state->crtc_num[i], setting, preserve) < 0)
 				return -1;
-		}
 	}
 
 	return 0;