style and some minor fixes

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

1 files changed, 9 insertions, 12 deletions

diff --git a/src/gamma-w32gdi.c b/src/gamma-w32gdi.c
index a252e0a..5beb1a9 100644
--- a/src/gamma-w32gdi.c
+++ b/src/gamma-w32gdi.c
@@ -50,14 +50,14 @@ w32gdi_start(struct gamma_state *state, program_mode_t mode)
 	/* Open device context */
 	hDC = GetDC(NULL);
 	if (!hDC) {
-		weprintf(_("Unable to open device context.\n"));
+		weprintf(_("Unable to open device context."));
 		return -1;
 	}
 
 	/* Check support for gamma ramps */
 	cmcap = GetDeviceCaps(hDC, COLORMGMTCAPS);
 	if (cmcap != CM_GAMMA_RAMP) {
-		weprintf(_("Display device does not support gamma ramps.\n"));
+		weprintf(_("Display device does not support gamma ramps."));
 		return -1;
 	}
 
@@ -66,7 +66,7 @@ w32gdi_start(struct gamma_state *state, program_mode_t mode)
 
 	/* Save current gamma ramps so we can restore them at program exit */
 	if (!GetDeviceGammaRamp(hDC, state->saved_ramps)) {
-		weprintf(_("Unable to save current gamma ramp.\n"));
+		weprintf(_("Unable to save current gamma ramp."));
 		ReleaseDC(NULL, hDC);
 		return -1;
 	}
@@ -80,9 +80,7 @@ w32gdi_start(struct gamma_state *state, program_mode_t mode)
 static void
 w32gdi_free(struct gamma_state *state)
 {
-	/* Free saved ramps */
 	free(state->saved_ramps);
-
 	free(state);
 }
 
@@ -98,10 +96,9 @@ static int
 w32gdi_set_option(struct gamma_state *state, const char *key, const char *value)
 {
 	if (!strcasecmp(key, "preserve")) {
-		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;
 	}
 
@@ -117,7 +114,7 @@ w32gdi_restore(struct gamma_state *state)
 	/* Open device context */
 	hDC = GetDC(NULL);
 	if (!hDC) {
-		fputs(_("Unable to open device context.\n"), stderr);
+		weprintf(_("Unable to open device context."));
 		return;
 	}
 
@@ -129,7 +126,7 @@ w32gdi_restore(struct gamma_state *state)
 		if (SetDeviceGammaRamp(hDC, state->saved_ramps))
 			goto done;
 	}
-	weprintf(_("Unable to restore gamma ramps.\n"));
+	weprintf(_("Unable to restore gamma ramps."));
 
 done:
 	/* Release device context */
@@ -147,7 +144,7 @@ w32gdi_set_temperature(
 	/* Open device context */
 	hDC = GetDC(NULL);
 	if (!hDC) {
-		weprintf(_("Unable to open device context.\n"));
+		weprintf(_("Unable to open device context."));
 		return -1;
 	}
 
@@ -182,7 +179,7 @@ w32gdi_set_temperature(
 		if (SetDeviceGammaRamp(hDC, gamma_ramps))
 			goto done;
 	}
-	weprintf(_("Unable to set gamma ramps.\n"));
+	weprintf(_("Unable to set gamma ramps."));
 	free(gamma_ramps);
 	ReleaseDC(NULL, hDC);
 	return -1;