Small cleanup

tihirvon · Nov 11, 2012 · 15905fa · 15905fa
1 parent 42ae207
commit 15905fa
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/options.c b/options.c
@@ -562,19 +562,19 @@ void toggle_option_values(const char *name, bool global, bool verbose, char **va
 {
 	const struct option_description *desc = find_toggle_option(name, &global);
 	int i, count = count_strings(values);
-	char *ptr = NULL;
+	char *ptr;
 
 	if (!desc)
 		return;
 
+	if (global) {
+		ptr = global_ptr(desc);
+	} else {
+		ptr = local_ptr(desc, &buffer->options);
+	}
 	if (desc->type == OPT_STR) {
 		char *value;
 
-		if (global)
-			ptr = global_ptr(desc);
-		else
-			ptr = local_ptr(desc, &buffer->options);
-
 		value = *(char **)ptr;
 		for (i = 0; i < count; i++) {
 			if (streq(values[i], value))
@@ -621,11 +621,6 @@ void toggle_option_values(const char *name, bool global, bool verbose, char **va
 			break;
 		}
 
-		if (global)
-			ptr = global_ptr(desc);
-		else
-			ptr = local_ptr(desc, &buffer->options);
-
 		value = *(int *)ptr;
 		for (i = 0; i < count; i++) {
 			if (value == ints[i])