[1/2] kconfig: Factor out conf_validate_choice_val() function from conf_read_simple()

Commit Message

David Woodhouse July 30, 2011, 11:13 p.m. UTC

We're going to want to do this from elsewhere, shortly...

Signed-off-by: David Woodhouse <[e-mail]>
---
 scripts/kconfig/confdata.c |   42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 deletions(-)

Patch

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 2bafd9a..a518ab3 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -179,6 +179,27 @@  static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p)
 	return 0;
 }
 
+static void conf_validate_choice_val(struct symbol *sym, int def, int def_flags)
+{
+	struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
+	switch (sym->def[def].tri) {
+	case no:
+		break;
+	case mod:
+		if (cs->def[def].tri == yes) {
+			conf_warning("%s creates inconsistent choice state", sym->name);
+			cs->flags &= ~def_flags;
+		}
+		break;
+	case yes:
+		if (cs->def[def].tri != no)
+			conf_warning("override: %s changes choice state", sym->name);
+		cs->def[def].val = sym;
+		break;
+	}
+	cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
+}
+
 int conf_read_simple(const char *name, int def)
 {
 	FILE *in = NULL;
@@ -311,25 +332,8 @@  load:
 			continue;
 		}
 setsym:
-		if (sym && sym_is_choice_value(sym)) {
-			struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
-			switch (sym->def[def].tri) {
-			case no:
-				break;
-			case mod:
-				if (cs->def[def].tri == yes) {
-					conf_warning("%s creates inconsistent choice state", sym->name);
-					cs->flags &= ~def_flags;
-				}
-				break;
-			case yes:
-				if (cs->def[def].tri != no)
-					conf_warning("override: %s changes choice state", sym->name);
-				cs->def[def].val = sym;
-				break;
-			}
-			cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
-		}
+		if (sym && sym_is_choice_value(sym))
+			conf_validate_choice_val(sym, def, def_flags);
 	}
 	fclose(in);