From patchwork Sat Jul 13 18:08:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 2827184 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CC4739F756 for ; Sat, 13 Jul 2013 18:09:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED320200C6 for ; Sat, 13 Jul 2013 18:09:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03F432008F for ; Sat, 13 Jul 2013 18:09:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758161Ab3GMSJE (ORCPT ); Sat, 13 Jul 2013 14:09:04 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:35161 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758234Ab3GMSIk (ORCPT ); Sat, 13 Jul 2013 14:08:40 -0400 Received: by mail-wi0-f172.google.com with SMTP id c10so1668215wiw.11 for ; Sat, 13 Jul 2013 11:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=S6kQZ+dbqLYwN5Z9hOVtHbL8iN7a+RF5X8hDPSqkLp0=; b=sBtnjNmsqJEW9L98Yjnh+niKaYFWfKuhrpooyIGiUl8F/4KGZyaVIPqt+pTHAwH8tJ yxaUKrLD2BAjOCTvYuK2qSe/x0P6HF1NUGivNp2jywyQ5XyZ+OPZxDxnNnZVGfhQcoN3 EigkYnvBkp6S/VFz6n+70T4TiUNxCZ0xw34byMGleZ+TcwZC+cs8M+n6ccBbYpW3HwlD dJZxrCu7rtRu5bPeaWaelGEmXjULaWZD7eFkY4beFG//jZGzOuGuUeMacnlztBG9LWUb t179POFkw6coWwKksLxLKMmQDxegnltuz8vWn1dQv2o/YXZ2NOqxfTWcbxVimbJaHxrA Nimg== X-Received: by 10.180.13.75 with SMTP id f11mr4645983wic.43.1373738918982; Sat, 13 Jul 2013 11:08:38 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id j20sm10190986wie.7.2013.07.13.11.08.37 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Jul 2013 11:08:38 -0700 (PDT) From: "Yann E. MORIN" To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Michal Marek , Jean Delvare , "Yann E. MORIN" Subject: [PATCH 3/3] kconfig: cleanup symbol-search code Date: Sat, 13 Jul 2013 20:08:25 +0200 Message-Id: <1373738905-23396-4-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1373738905-23396-1-git-send-email-yann.morin.1998@free.fr> References: <1373738905-23396-1-git-send-email-yann.morin.1998@free.fr> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Yann E. MORIN" - no need for a double-indirection for the temporary sym_match_arr array - the temporary sym_match_arr array is not NULL terminated, so no need to allocate n+1 elements - two minor style fixes - grammar fix in comment Reported-by: Jean Delvare Signed-off-by: "Yann E. MORIN" Cc: Jean Delvare Reviewed-by: Jean Delvare --- scripts/kconfig/symbol.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index 020a0ac..a76b8fd 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -963,10 +963,10 @@ struct sym_match { * - first, symbols that match exactly * - then, alphabetical sort */ -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; - struct sym_match *s2 = *(struct sym_match **)sym2; + const struct sym_match *s1 = sym1; + const struct sym_match *s2 = sym2; int exact1, exact2; /* 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, **sym_arr = NULL; - struct sym_match **sym_match_arr = NULL; + struct sym_match *sym_match_arr = NULL; int i, cnt, size; regex_t re; regmatch_t match[1]; @@ -1005,47 +1005,38 @@ struct symbol **sym_re_search(const char *pattern) return NULL; for_all_symbols(i, sym) { - struct sym_match *tmp_sym_match; if (sym->flags & SYMBOL_CONST || !sym->name) continue; if (regexec(&re, sym->name, 1, match, 0)) continue; - if (cnt + 1 >= size) { + if (cnt >= size) { void *tmp; size += 16; - tmp = realloc(sym_match_arr, size * sizeof(struct sym_match *)); - if (!tmp) { + tmp = realloc(sym_match_arr, size * sizeof(struct sym_match)); + if (!tmp) goto sym_re_search_free; - } sym_match_arr = tmp; } 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 return 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 */ - tmp_sym_match->so = match[0].rm_so; - tmp_sym_match->eo = match[0].rm_eo; - sym_match_arr[cnt++] = tmp_sym_match; + sym_match_arr[cnt].so = match[0].rm_so; + sym_match_arr[cnt].eo = match[0].rm_eo; + sym_match_arr[cnt++].sym = sym; } 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)); if (!sym_arr) goto sym_re_search_free; 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_re_search_free: - if (sym_match_arr) { - for (i = 0; i < cnt; i++) - free(sym_match_arr[i]); - free(sym_match_arr); - } + /* sym_match_arr can be NULL if no match, but free(NULL) is OK */ + free(sym_match_arr); regfree(&re); return sym_arr;