GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 14:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kconfig: remove k_invalid from expr_parse_string() return type

Browse source 
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: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2018-11-30 18:15:52 +09:00
parent 2aabbed677
commit 0cbe3ac439
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/kconfig/expr.c
View file

@ -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,
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)
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);