From patchwork Sat Jul 2 05:10:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 940142 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p625AnEA006738 for ; Sat, 2 Jul 2011 05:10:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751228Ab1GBFKy (ORCPT ); Sat, 2 Jul 2011 01:10:54 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:35815 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750936Ab1GBFKy (ORCPT ); Sat, 2 Jul 2011 01:10:54 -0400 Received: by mail-iw0-f174.google.com with SMTP id 6so3288158iwn.19 for ; Fri, 01 Jul 2011 22:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=2kT/4Vh6jA4sIQiLS0eoLy/Wp/MmRtLEzMuWsGgXfz0=; b=RFvSoC7nf0USCUTN0Ru/2Gw3AZY1vjPyTW2V2DRVLSIzEKoH2VRTnqzIqFyvgjBdd1 FErjWsN1FR80Z70CyzK3dTs2KdjeG5z4F4adNiA/7N+OEDN5CGYzFbImXRfuU6/adbP/ 5CGmZB/gkUw8Wzntw3o7aqJhdhrRKecupipp0= Received: by 10.42.154.199 with SMTP id r7mr3725949icw.145.1309583454027; Fri, 01 Jul 2011 22:10:54 -0700 (PDT) Received: from localhost.localdomain (69-165-144-226.dsl.teksavvy.com [69.165.144.226]) by mx.google.com with ESMTPS id a9sm1507011icy.6.2011.07.01.22.10.52 (version=SSLv3 cipher=OTHER); Fri, 01 Jul 2011 22:10:53 -0700 (PDT) From: Arnaud Lacombe To: linux-kbuild@vger.kernel.org, Michal Marek Cc: Arnaud Lacombe Subject: [PATCH 5/5] kconfig/conf: mark xfgets() private Date: Sat, 2 Jul 2011 01:10:40 -0400 Message-Id: <1309583440-4795-6-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.3.4.574.g608b.dirty In-Reply-To: <1309583440-4795-1-git-send-email-lacombar@gmail.com> References: <1307386711-8866-1-git-send-email-lacombar@gmail.com> <1309583440-4795-1-git-send-email-lacombar@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 02 Jul 2011 05:10:55 +0000 (UTC) This function has not much reason to be public. In the mean time, convert declaration from K&R C to ISO C. Signed-off-by: Arnaud Lacombe --- scripts/kconfig/conf.c | 7 +++---- scripts/kconfig/lkc.h | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 819ab18..f208f90 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -18,6 +18,7 @@ static void conf(struct menu *menu); static void check_conf(struct menu *menu); +static void xfgets(char *str, int size, FILE *in); enum input_mode { oldaskconfig, @@ -672,13 +673,11 @@ int main(int ac, char **av) } return 0; } + /* * Helper function to facilitate fgets() by Jean Sacren. */ -void xfgets(str, size, in) - char *str; - int size; - FILE *in; +void xfgets(char *str, int size, FILE *in) { if (fgets(str, size, in) == NULL) fprintf(stderr, "\nError in reading or end of file.\n"); diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 60ffe8c..eed2249 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -76,9 +76,6 @@ void zconf_nextfile(const char *name); int zconf_lineno(void); const char *zconf_curname(void); -/* conf.c */ -void xfgets(char *str, int size, FILE *in); - /* confdata.c */ const char *conf_get_configname(void); const char *conf_get_autoconfig_name(void);