evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kconfig: simplify symbol-search code

Browse source 
There is no need for a double indirection in the temporary array that
stores the internediate search results.

Reported-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
This commit is contained in:
Yann E. MORIN 2013-07-16 20:39:42 +02:00
parent 1407f97aed
commit 508382a042
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/kconfig/symbol.c
View file

@ -965,8 +965,8 @@ struct sym_match {
*/ */
static int sym_rel_comp(const void *sym1, const void *sym2) static int sym_rel_comp(const void *sym1, const void *sym2)
{ {
struct sym_match *s1 = *(struct sym_match **)sym1; const struct sym_match *s1 = sym1;
struct sym_match *s2 = *(struct sym_match **)sym2; const struct sym_match *s2 = sym2;
int exact1, exact2; int exact1, exact2;
/* Exact match: /* Exact match:
@ -992,7 +992,7 @@ static int sym_rel_comp(const void *sym1, const void *sym2)
struct symbol **sym_re_search(const char *pattern) struct symbol **sym_re_search(const char *pattern)
{ {
struct symbol *sym, **sym_arr = NULL; struct symbol *sym, **sym_arr = NULL;
struct sym_match **sym_match_arr = NULL; struct sym_match *sym_match_arr = NULL;
int i, cnt, size; int i, cnt, size;
regex_t re; regex_t re;
regmatch_t match[1]; regmatch_t match[1];
@ -1005,7 +1005,6 @@ struct symbol **sym_re_search(const char *pattern)
return NULL; return NULL;
for_all_symbols(i, sym) { for_all_symbols(i, sym) {
struct sym_match *tmp_sym_match;
if (sym->flags & SYMBOL_CONST || !sym->name) if (sym->flags & SYMBOL_CONST || !sym->name)
continue; continue;
if (regexec(&re, sym->name, 1, match, 0)) if (regexec(&re, sym->name, 1, match, 0))
@ -1013,38 +1012,31 @@ struct symbol **sym_re_search(const char *pattern)
if (cnt >= size) { if (cnt >= size) {
void *tmp; void *tmp;
size += 16; size += 16;
tmp = realloc(sym_match_arr, size * sizeof(struct sym_match *)); tmp = realloc(sym_match_arr, size * sizeof(struct sym_match));
if (!tmp) if (!tmp)
goto sym_re_search_free; goto sym_re_search_free;
sym_match_arr = tmp; sym_match_arr = tmp;
} }
sym_calc_value(sym); sym_calc_value(sym);
tmp_sym_match = (struct sym_match*)malloc(sizeof(struct sym_match));
if (!tmp_sym_match)
goto sym_re_search_free;
tmp_sym_match->sym = sym;
/* As regexec returned 0, we know we have a match, so /* As regexec returned 0, we know we have a match, so
* we can use match[0].rm_[se]o without further checks * we can use match[0].rm_[se]o without further checks
*/ */
tmp_sym_match->so = match[0].rm_so; sym_match_arr[cnt].so = match[0].rm_so;
tmp_sym_match->eo = match[0].rm_eo; sym_match_arr[cnt].eo = match[0].rm_eo;
sym_match_arr[cnt++] = tmp_sym_match; sym_match_arr[cnt++].sym = sym;
} }
if (sym_match_arr) { if (sym_match_arr) {
qsort(sym_match_arr, cnt, sizeof(struct sym_match*), sym_rel_comp); qsort(sym_match_arr, cnt, sizeof(struct sym_match), sym_rel_comp);
sym_arr = malloc((cnt+1) * sizeof(struct symbol)); sym_arr = malloc((cnt+1) * sizeof(struct symbol));
if (!sym_arr) if (!sym_arr)
goto sym_re_search_free; goto sym_re_search_free;
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
sym_arr[i] = sym_match_arr[i]->sym; sym_arr[i] = sym_match_arr[i].sym;
sym_arr[cnt] = NULL; sym_arr[cnt] = NULL;
} }
sym_re_search_free: sym_re_search_free:
if (sym_match_arr) { /* sym_match_arr can be NULL if no match, but free(NULL) is OK */
for (i = 0; i < cnt; i++) free(sym_match_arr);
free(sym_match_arr[i]);
free(sym_match_arr);
}
regfree(&re); regfree(&re);
return sym_arr; return sym_arr;