1 files changed, 39 insertions, 46 deletions

diff --git a/src/state.c b/src/state.c
index 784b429..5640045 100644
--- a/src/state.c
+++ b/src/state.c
@@ -16,19 +16,13 @@
  */
 #include "state.h"
 #include "solar.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include "macros.h"
 #include <errno.h>
 #include <limits.h>
 
 #include <libgamma.h>
 
 
-#define try(...)  do { if (!(__VA_ARGS__)) goto fail; } while (0)
-#define t(...)    do { if   (__VA_ARGS__)  goto fail; } while (0)
-
-
 
 /**
  * The name of the process.
@@ -121,10 +115,10 @@ displayenvcmp(const void *a_, const void *b_)
 static char *
 escape_display(const char* str)
 {
-	char *r, *w, *rc = malloc((2 * strlen(str) + 1) * sizeof(char));
+	char *r, *w, *rc = NULL;
 	int s = 0;
-	if (!rc)  return NULL;
-	memcpy(rc, str, (strlen(str) + 1) * sizeof(char));
+	xmalloc(&rc, 2 * strlen(str) + 1);
+	strcpy(rc, str);
 	for (r = w = strchr(rc, '=') + 1; *r; r++) {
 		if (!s || (*r != '/')) {
 			if (strchr("@=/", *r))  *w++ = '@';
@@ -133,6 +127,7 @@ escape_display(const char* str)
 		}
 	}
 	w[s ? -2 : 0] = '\0';
+fail:
 	return rc;
 }
 
@@ -149,9 +144,9 @@ get_display_string(const struct settings *settings)
 	const char *var, *val;
 	char *r, *d = NULL, *rc = NULL, **displays;
 	size_t i, n = 0, len = 0;
-	int method, saved_errno;
+	int method;
 
-	try (displays = malloc(settings->monitors_n * sizeof(char *)));
+	xmalloc(&displays, settings->monitors_n);
 	for (i = 0; i < settings->monitors_n; i++)
 		if ((settings->monitors_arg[i] == 'd') && strchr(settings->monitors_id[i], '='))
 			len += 1 + strlen(displays[n++] = settings->monitors_id[i]);
@@ -168,23 +163,23 @@ get_display_string(const struct settings *settings)
 	var = libgamma_method_default_site_variable(method);
 	val = libgamma_method_default_site(method);
 	if (!val)  return strdup("");
-	try (d = malloc((3 + strlen(var) + strlen(val)) * sizeof(char)));
+	xmalloc(&d, 3 + strlen(var) + strlen(val));
 	stpcpy(stpcpy(stpcpy(stpcpy(d, "."), var), "="), val);
-	try (rc = escape_display(d));
+	try (rc = escape_display(d)); /* TODO strip screen number */
 	return free(d), rc;
 
 custom:
 	qsort(displays, n, sizeof(*displays), displayenvcmp);
-	try (r = rc = malloc((2 * len + 1) * sizeof(char)));
-	for (i = 0; i < n; i++) {
-		try (d = escape_display(displays[i]));
+	xmalloc(&rc, 2 * len + 1);
+	for (r = rc, i = 0; i < n; i++) {
+		try (d = escape_display(displays[i])); /* TODO see above */
 		r = stpcpy(stpcpy(r, "."), d), free(d), d = NULL;
 	}
 	free(displays);
 	return rc;
 
 fail:
-	saved_errno = errno, free(rc), free(d), free(displays), errno = saved_errno;
+	CLEANUP(free(rc), free(d), free(displays));
 	return NULL;
 }
 
@@ -201,14 +196,15 @@ get_state_pathname(const struct settings *settings)
 	const char *dir = getenv("XGD_RUNTIME_DIR");
 	char *display = NULL;
 	char *env = NULL;
-	int rc = -1, saved_errno;
+	int rc = -1;
 	try (display = get_display_string(settings));
 	if (!dir || !*dir)  dir = "/run";
-	try (env = malloc((strlen(dir) + sizeof("/radharc/") + strlen(display)) * sizeof(char)));
+	xmalloc(&env, strlen(dir) + sizeof("/radharc/") + strlen(display));
 	stpcpy(stpcpy(stpcpy(env, dir), "/radharc/"), display);
 	rc = setenv("RADHARC_STATE", env, 1);
 fail:
-	return saved_errno = errno, free(env), free(display), errno = saved_errno, rc;
+	CLEANUP(free(env), free(display));
+	return rc;
 }
 
 
@@ -221,36 +217,37 @@ fail:
 static int
 get_clut_method(const char *display)
 {
+#define HAIKU(TEXT)  t ((msg = (TEXT)))
+
 	int method;
 	const char *env;
+	const char *msg;
 
 	if (!display) {
-		if (!libgamma_list_methods(&method, 1, 0)) {
-			fprintf(stderr, "No display was found.\n"
-			                "DRM support missing.\n"
-			                "Can you even see?\n");
-			return errno = 0, -1;
-		}
+		if (!libgamma_list_methods(&method, 1, 0))
+			HAIKU("No display was found.\n"
+			      "DRM support missing.\n"
+			      "Can you even see?\n");
 		return method;
 	}
 	if (!strcasecmp(display, "none"))  return INT_MAX;
 	if (!strcasecmp(display, "drm"))   return LIBGAMMA_METHOD_LINUX_DRM;
-	if (!strchr(display, '=')) {
-		fprintf(stderr, "Specified display\n"
-		                "cannot be recognised.\n"
-		                "Try something else.\n");
-		return errno = 0, -1;
-	}
+	if (!strchr(display, '='))
+		HAIKU("Specified display\n"
+		      "cannot be recognised.\n"
+		      "Try something else.\n");
 
 	for (method = 0; method < LIBGAMMA_METHOD_COUNT; method++) {
 		env = libgamma_method_default_site_variable(method);
 		if (env && (strstr(display, env) == display) && (display[strlen(env)] == '='))
 			return method;
 	}
+	HAIKU("Specified display\n"
+	      "cannot be recognised.\n"
+	      "Try to recompile.\n");
 
-	fprintf(stderr, "Specified display\n"
-	                "cannot be recognised.\n"
-	                "Try to recompile.\n");
+fail:
+	fprintf(stderr, "%s", msg);
 	return errno = 0, -1;
 }
 
@@ -266,15 +263,13 @@ initialise_clut(const struct settings *settings)
 {
 #define NONE_METHOD  (method == INT_MAX)
 
-	int method = 0, error = 0, is_none = 0;
+	int method = 0, error = 0;
 	const char *sitename_;
 	char *sitename = NULL;
-	void *new;
 	size_t i, j, parts_off = 0;
 	libgamma_site_state_t site;
-	int saved_errno;
 
-	try (sites = calloc(settings->monitors_n + 1, sizeof(*sites)));
+	xcalloc(&sites, settings->monitors_n + 1);
 
 	for (i = 0; i < settings->monitors_n; i++) {
 		switch (settings->monitors_arg[i]) {
@@ -283,12 +278,11 @@ initialise_clut(const struct settings *settings)
 			t ((method = get_clut_method(sitename_ = settings->monitors_id[i])) < 0);
 			if (NONE_METHOD)  break;
 			sitename_ = strchr(sitename_, '=');
-			if (sitename_)  try ((sitename = strdup(sitename_ + 1)));
+			xstrdup(&sitename, sitename_ ? sitename_ + 1 : NULL);
 			t ((error = libgamma_site_initialise(sites + sites_n, method, sitename)));
 			sitename = NULL;
 			site = sites[sites_n++];
-			try (new = realloc(parts, (parts_n + site.partitions_available) * sizeof(*parts)));
-			parts = new;
+			xrealloc(&parts, parts_n + site.partitions_available);
 			for (j = 0; j < site.partitions_available; j++) {
 				t ((error = libgamma_partition_initialise(parts + parts_n, &site, j)));
 				parts_n++;
@@ -307,13 +301,12 @@ initialise_clut(const struct settings *settings)
 		}
 	}
 
-	new = realloc(sites, (sites_n + 1) * sizeof(*sites));
-	sites = new ? new : sites;
+	SHRINK(&sites, sites_n + 1);
 
 	return 0;
 fail:
 	if (error)  libgamma_perror(argv0, error), errno = 0;
-	saved_errno = errno, free(sitename), errno = saved_errno;
+	CLEANUP(free(sitename));
 	return -1;
 }