From: Arnaud Lacombe <lacombar@gmail.com>
To: linux-kbuild@vger.kernel.org, Michal Marek <mmarek@suse.cz>
Cc: Arnaud Lacombe <lacombar@gmail.com>
Subject: [PATCH 5/5] kconfig/conf: mark xfgets() private
Date: Sat, 2 Jul 2011 01:10:40 -0400 [thread overview]
Message-ID: <1309583440-4795-6-git-send-email-lacombar@gmail.com> (raw)
In-Reply-To: <1309583440-4795-1-git-send-email-lacombar@gmail.com>
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 <lacombar@gmail.com>
---
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);
--
1.7.3.4.574.g608b.dirty
next prev parent reply other threads:[~2011-07-02 5:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-06 18:58 [PATCH 0/9] Random kconfig patches Arnaud Lacombe
2011-06-06 18:58 ` [PATCH 1/9] kconfig: annotate non-trivial fall-trough Arnaud Lacombe
2011-06-06 19:08 ` Daniel K.
2011-06-06 19:34 ` Arnaud Lacombe
2011-06-06 18:58 ` [PATCH 2/9] kconfig: fix return code for invalid boolean symbol in conf_set_sym_val() Arnaud Lacombe
2011-06-06 18:58 ` [PATCH 3/9] kconfig: add missing <stdarg.h> inclusion Arnaud Lacombe
2011-06-06 18:58 ` [PATCH 4/9] kconfig: add missing <ctype.h> inclusion Arnaud Lacombe
2011-06-06 18:58 ` [PATCH 5/9] kconfig: add missing <stdlib.h> inclusion Arnaud Lacombe
2011-06-06 18:58 ` [PATCH 6/9] kconfig: nuke reference to SWIG Arnaud Lacombe
2011-06-06 18:58 ` [PATCH 7/9] kconfig: nuke LKC_DIRECT_LINK cruft Arnaud Lacombe
2011-06-06 18:58 ` [PATCH 8/9] kconfig/gconf: kill deadcode Arnaud Lacombe
2011-06-06 18:58 ` [PATCH 9/9] kconfig/gconf: silent missing prototype warnings Arnaud Lacombe
2011-06-08 16:03 ` [PATCH 0/9] Random kconfig patches Michal Marek
2011-07-02 5:10 ` [PATCH 0/5] Random kconfig patches (second iteration) Arnaud Lacombe
2011-07-02 5:10 ` [PATCH 1/5] kconfig: use calloc() for expr allocation Arnaud Lacombe
2011-07-02 5:10 ` [PATCH 2/5] kconfig/conf: reduce the scope of `defconfig_file' Arnaud Lacombe
2011-07-02 5:10 ` [PATCH 3/5] kconfig/conf: add command line options' description Arnaud Lacombe
2011-07-02 5:10 ` [PATCH 4/5] kconfig: remove pending prototypes for kconfig_load() Arnaud Lacombe
2011-07-02 5:10 ` Arnaud Lacombe [this message]
2011-07-04 9:39 ` [PATCH 0/5] Random kconfig patches (second iteration) Michal Marek
2011-07-08 1:31 ` Arnaud Lacombe
2011-07-12 9:04 ` Michal Marek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309583440-4795-6-git-send-email-lacombar@gmail.com \
--to=lacombar@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=mmarek@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox