Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8baefd30 authored by Arnaud Lacombe's avatar Arnaud Lacombe
Browse files

kconfig: replace a `switch()' statement by a more flexible `if()' statement 



With the upcoming dynamical configuration prefix, we can no longer assume that
the prefix will start by a 'C'. As such, we can no longer hardcode this value in
the `case ...:', so replace the `switch() { ... }' statement by a more flexible
'if () { ... }' statement.

Signed-off-by: default avatarArnaud Lacombe <lacombar@gmail.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarMichal Marek <mmarek@suse.cz>
parent 71d80662

scripts/kconfig/confdata.c

+5 −14
Original line number Diff line number Diff line
@@ -221,8 +221,7 @@ int conf_read_simple(const char *name, int def) 
	while (fgets(line, sizeof(line), in)) {

		conf_lineno++;

		sym = NULL;

		switch (line[0]) {

		case '#':

		if (line[0] == '#') {

			if (memcmp(line + 2, "CONFIG_", 7))

				continue;

			p = strchr(line + 9, ' ');
@@ -254,12 +253,7 @@ int conf_read_simple(const char *name, int def) 
			default:

				;

			}

			break;

		case 'C':

			if (memcmp(line, "CONFIG_", 7)) {

				conf_warning("unexpected data");

				continue;

			}

		} else if (memcmp(line, "CONFIG_", 7) == 0) {

			p = strchr(line + 7, '=');

			if (!p)

				continue;
@@ -286,11 +280,8 @@ int conf_read_simple(const char *name, int def) 
			}

			if (conf_set_sym_val(sym, def, def_flags, p))

				continue;

			break;

		case '\r':

		case '\n':

			break;

		default:

		} else {

			if (line[0] != '\r' && line[0] != '\n')

				conf_warning("unexpected data");

			continue;

		}