Commit 0cbe3ac4 authored by Masahiro Yamada's avatar Masahiro Yamada

kconfig: remove k_invalid from expr_parse_string() return type

The only possibility of k_invalid being returned was when
expr_parse_sting() parsed S_OTHER type symbol. This actually never
happened, and this is even clearer since S_OTHER has gone.

Clean up unreachable code.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 2aabbed6
...@@ -980,7 +980,6 @@ enum string_value_kind { ...@@ -980,7 +980,6 @@ enum string_value_kind {
k_string, k_string,
k_signed, k_signed,
k_unsigned, k_unsigned,
k_invalid
}; };
union string_value { union string_value {
...@@ -1011,13 +1010,10 @@ static enum string_value_kind expr_parse_string(const char *str, ...@@ -1011,13 +1010,10 @@ static enum string_value_kind expr_parse_string(const char *str,
val->u = strtoull(str, &tail, 16); val->u = strtoull(str, &tail, 16);
kind = k_unsigned; kind = k_unsigned;
break; break;
case S_STRING: default:
case S_UNKNOWN:
val->s = strtoll(str, &tail, 0); val->s = strtoll(str, &tail, 0);
kind = k_signed; kind = k_signed;
break; break;
default:
return k_invalid;
} }
return !errno && !*tail && tail > str && isxdigit(tail[-1]) return !errno && !*tail && tail > str && isxdigit(tail[-1])
? kind : k_string; ? kind : k_string;
...@@ -1073,13 +1069,7 @@ tristate expr_calc_value(struct expr *e) ...@@ -1073,13 +1069,7 @@ tristate expr_calc_value(struct expr *e)
if (k1 == k_string || k2 == k_string) if (k1 == k_string || k2 == k_string)
res = strcmp(str1, str2); res = strcmp(str1, str2);
else if (k1 == k_invalid || k2 == k_invalid) { else if (k1 == k_unsigned || k2 == k_unsigned)
if (e->type != E_EQUAL && e->type != E_UNEQUAL) {
printf("Cannot compare \"%s\" and \"%s\"\n", str1, str2);
return no;
}
res = strcmp(str1, str2);
} else if (k1 == k_unsigned || k2 == k_unsigned)
res = (lval.u > rval.u) - (lval.u < rval.u); res = (lval.u > rval.u) - (lval.u < rval.u);
else /* if (k1 == k_signed && k2 == k_signed) */ else /* if (k1 == k_signed && k2 == k_signed) */
res = (lval.s > rval.s) - (lval.s < rval.s); res = (lval.s > rval.s) - (lval.s < rval.s);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment