1 files changed, 22 insertions, 20 deletions

diff --git a/src/gamma.c b/src/gamma.c
index 508374b..628105b 100644
--- a/src/gamma.c
+++ b/src/gamma.c
@@ -44,26 +44,25 @@ const struct gamma_method *gamma_methods[] = {
 
 
 static int
-try_start(const struct gamma_method *method, GAMMA_STATE **state,
-          enum program_mode mode, struct config_ini_state *config, char *args)
+try_start(const struct gamma_method *method, GAMMA_STATE **state_out, struct config_ini_state *config, char *args)
 {
 	struct config_ini_section *section;
 	struct config_ini_setting *setting;
 	char *next_arg, *value;
 	const char *key;
 
-	if (method->init(state) < 0) {
+	if (method->create(state_out) < 0) {
 		weprintf(_("Initialization of %s failed."), method->name);
-		return -1;
+		goto fail;
 	}
 
-	/* Set method options from config file. */
+	/* Set method options from config file */
 	if ((section = config_ini_get_section(config, method->name)))
 		for (setting = section->settings; setting; setting = setting->next)
-			if (method->set_option(*state, setting->name, setting->value) < 0)
+			if (method->set_option(*state_out, setting->name, setting->value) < 0)
 				goto set_option_fail;
 
-	/* Set method options from command line. */
+	/* Set method options from command line */
 	while (args) {
 		next_arg = strchr(args, ':');
 		if (next_arg)
@@ -73,30 +72,33 @@ try_start(const struct gamma_method *method, GAMMA_STATE **state,
 		value = strchr(args, '=');
 		if (!value) {
 			weprintf(_("Failed to parse option `%s'."), args);
-			return -1;
+			goto fail;
 		}
 		*value++ = '\0';
 
-		if (method->set_option(*state, key, value) < 0)
+		if (method->set_option(*state_out, key, value) < 0)
 			goto set_option_fail;
 
 		args = next_arg;
 	}
 
-	/* Start method. */
-	if (method->start(*state, mode) < 0) {
-		method->free(*state);
+	/* Start method */
+	if (method->start(*state_out) < 0) {
 		weprintf(_("Failed to start adjustment method %s."), method->name);
-		return -1;
+		goto fail;
 	}
 
 	return 0;
 
 set_option_fail:
-	method->free(*state);
 	weprintf(_("Failed to set %s option."), method->name);
 	/* TRANSLATORS: `help' must not be translated. */
 	weprintf(_("Try `-m %s:help' for more information."), method->name);
+fail:
+	if (*state_out) {
+		method->free(*state_out);
+		*state_out = NULL;
+	}
 	return -1;
 }
 
@@ -107,27 +109,27 @@ acquire_adjustment_method(struct settings *settings, GAMMA_STATE **method_state_
 	size_t i;
 
 	if (settings->method) {
-		/* Use method specified on command line. */
-		if (try_start(settings->method, method_state_out, settings->mode, &settings->config, settings->method_args) < 0)
+		/* Use method specified on command line */
+		if (try_start(settings->method, method_state_out, &settings->config, settings->method_args) < 0)
 			exit(1);
 	} else {
-		/* Try all methods, use the first that works. */
+		/* Try all methods, use the first that works */
 		for (i = 0; gamma_methods[i]; i++) {
 			if (!gamma_methods[i]->autostart)
 				continue;
 
-			if (try_start(gamma_methods[i], method_state_out, settings->mode, &settings->config, NULL) < 0) {
+			if (try_start(gamma_methods[i], method_state_out, &settings->config, NULL) < 0) {
 				weprintf(_("Trying next method..."));
 				continue;
 			}
 
-			/* Found method that works. */
+			/* Found method that works */
 			printf(_("Using method `%s'.\n"), gamma_methods[i]->name);
 			settings->method = gamma_methods[i];
 			break;
 		}
 
-		/* Failure if no methods were successful at this point. */
+		/* Failure if no methods were successful at this point */
 		if (!settings->method)
 			eprintf(_("No more methods to try."));
 	}