Skip to content

Commit

Permalink
kconfig: remove sym_expand_string_value()
Browse files Browse the repository at this point in the history
There is no more caller of sym_expand_string_value().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
  • Loading branch information
Masahiro Yamada committed May 28, 2018
1 parent 96d8e48 commit 5b31a97
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 54 deletions.
1 change: 0 additions & 1 deletion scripts/kconfig/lkc_proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];

struct symbol * sym_lookup(const char *name, int flags);
struct symbol * sym_find(const char *name);
char *sym_expand_string_value(const char *in);
const char * sym_escape_string_value(const char *in);
struct symbol ** sym_re_search(const char *pattern);
const char * sym_type_name(enum symbol_type type);
Expand Down
53 changes: 0 additions & 53 deletions scripts/kconfig/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -879,59 +879,6 @@ struct symbol *sym_find(const char *name)
return symbol;
}

/*
* Expand symbol's names embedded in the string given in argument. Symbols'
* name to be expanded shall be prefixed by a '$'. Unknown symbol expands to
* the empty string.
*/
char *sym_expand_string_value(const char *in)
{
const char *src;
char *res;
size_t reslen;

/*
* Note: 'in' might come from a token that's about to be
* freed, so make sure to always allocate a new string
*/
reslen = strlen(in) + 1;
res = xmalloc(reslen);
res[0] = '\0';

while ((src = strchr(in, '$'))) {
char *p, name[SYMBOL_MAXLENGTH];
const char *symval = "";
struct symbol *sym;
size_t newlen;

strncat(res, in, src - in);
src++;

p = name;
while (isalnum(*src) || *src == '_')
*p++ = *src++;
*p = '\0';

sym = sym_find(name);
if (sym != NULL) {
sym_calc_value(sym);
symval = sym_get_string_value(sym);
}

newlen = strlen(res) + strlen(symval) + strlen(src) + 1;
if (newlen > reslen) {
reslen = newlen;
res = xrealloc(res, reslen);
}

strcat(res, symval);
in = src;
}
strcat(res, in);

return res;
}

const char *sym_escape_string_value(const char *in)
{
const char *p;
Expand Down

0 comments on commit 5b31a97

Please sign in to comment.