style and some minor fixes

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

1 files changed, 13 insertions, 21 deletions

diff --git a/src/gamma-drm.c b/src/gamma-drm.c
index a4cc75e..b059eef 100644
--- a/src/gamma-drm.c
+++ b/src/gamma-drm.c
@@ -81,16 +81,14 @@ drm_start(struct gamma_state *state, enum program_mode mode)
 	if (state->fd < 0) {
 		/* TODO check if access permissions, normally root or
 		        membership of the video group is required. */
-		perror("open");
-		fprintf(stderr, _("Failed to open DRM device: %s\n"),
-			pathname);
+		weprintf(_("Failed to open DRM device `%s':"), pathname);
 		return -1;
 	}
 
 	/* Acquire mode resources. */
 	state->res = drmModeGetResources(state->fd);
 	if (state->res == NULL) {
-		fprintf(stderr, _("Failed to get DRM mode resources\n"));
+		weprintf(_("Failed to get DRM mode resources."));
 		close(state->fd);
 		state->fd = -1;
 		return -1;
@@ -100,14 +98,10 @@ drm_start(struct gamma_state *state, enum program_mode mode)
 	crtc_count = state->res->count_crtcs;
 	if (state->crtc_num >= 0) {
 		if (state->crtc_num >= crtc_count) {
-			fprintf(stderr, _("CRTC %d does not exist. "),
-				state->crtc_num);
-			if (crtc_count > 1) {
-				fprintf(stderr, _("Valid CRTCs are [0-%d].\n"),
-					crtc_count-1);
-			} else {
-				fprintf(stderr, _("Only CRTC 0 exists.\n"));
-			}
+			if (crtc_count > 1)
+				weprintf(_("CRTC %i does not exist, valid CRTCs are [0-%i].\n"), state->crtc_num, crtc_count-1);
+			else
+				weprintf(_("CRTC %i does not exist, only CRTC 0 exists.\n"), state->crtc_num);
 			close(state->fd);
 			state->fd = -1;
 			drmModeFreeResources(state->res);
@@ -145,15 +139,14 @@ drm_start(struct gamma_state *state, enum program_mode mode)
 		crtcs->crtc_id = state->res->crtcs[crtcs->crtc_num];
 		crtc_info = drmModeGetCrtc(state->fd, crtcs->crtc_id);
 		if (crtc_info == NULL) {
-			fprintf(stderr, _("CRTC %i lost, skipping\n"), crtcs->crtc_num);
+			weprintf(_("CRTC %i lost, skipping"), crtcs->crtc_num);
 			continue;
 		}
 		crtcs->gamma_size = crtc_info->gamma_size;
 		drmModeFreeCrtc(crtc_info);
 		if (crtcs->gamma_size <= 1) {
-			fprintf(stderr, _("Could not get gamma ramp size for CRTC %i\n"
-					  "on graphics card %i, ignoring device.\n"),
-				crtcs->crtc_num, state->card_num);
+			weprintf(_("Could not get gamma ramp size for CRTC %i on graphics card"
+			           " %i, ignoring device."), crtcs->crtc_num, state->card_num);
 			continue;
 		}
 		/* Valgrind complains about us reading uninitialize memory if we just use malloc. */
@@ -164,9 +157,8 @@ drm_start(struct gamma_state *state, enum program_mode mode)
 			int r = drmModeCrtcGetGamma(state->fd, crtcs->crtc_id, crtcs->gamma_size,
 						    crtcs->r_gamma, crtcs->g_gamma, crtcs->b_gamma);
 			if (r < 0) {
-				fprintf(stderr, _("DRM could not read gamma ramps on CRTC %i on\n"
-						  "graphics card %i, ignoring device.\n"),
-					crtcs->crtc_num, state->card_num);
+				weprintf(_("DRM could not read gamma ramps on CRTC %i on graphics card"
+				           " %i, ignoring device."), crtcs->crtc_num, state->card_num);
 				free(crtcs->r_gamma);
 				crtcs->r_gamma = NULL;
 			}
@@ -246,11 +238,11 @@ drm_set_option(struct gamma_state *state, const char *key, const char *value)
 	} else if (!strcasecmp(key, "crtc")) {
 		state->crtc_num = atoi(value);
 		if (state->crtc_num < 0) {
-			weprintf(_("CRTC must be a non-negative integer\n"));
+			weprintf(_("CRTC must be a non-negative integer"));
 			return -1;
 		}
 	} else {
-		weprintf(_("Unknown method parameter: `%s'.\n"), key);
+		weprintf(_("Unknown method parameter: `%s'."), key);
 		return -1;
 	}