diff options
author | Arnaud Lacombe <lacombar@gmail.com> | 2011-07-02 00:59:41 -0400 |
---|---|---|
committer | Arnaud Lacombe <lacombar@gmail.com> | 2011-07-02 01:04:40 -0400 |
commit | ab63f58f253c3eca620347f5180ca3d6a1b6aa38 (patch) | |
tree | a3d8769aa416913ced55ca0bc0833b809fc8085b | |
parent | 131c60a95e15e7d32b6f10881368e1ffe7296695 (diff) |
kconfig/conf: mark xfgets() private
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>
-rw-r--r-- | scripts/kconfig/conf.c | 7 | ||||
-rw-r--r-- | 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 819ab18961fe..f208f900ed3a 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -18,6 +18,7 @@ | |||
18 | 18 | ||
19 | static void conf(struct menu *menu); | 19 | static void conf(struct menu *menu); |
20 | static void check_conf(struct menu *menu); | 20 | static void check_conf(struct menu *menu); |
21 | static void xfgets(char *str, int size, FILE *in); | ||
21 | 22 | ||
22 | enum input_mode { | 23 | enum input_mode { |
23 | oldaskconfig, | 24 | oldaskconfig, |
@@ -672,13 +673,11 @@ int main(int ac, char **av) | |||
672 | } | 673 | } |
673 | return 0; | 674 | return 0; |
674 | } | 675 | } |
676 | |||
675 | /* | 677 | /* |
676 | * Helper function to facilitate fgets() by Jean Sacren. | 678 | * Helper function to facilitate fgets() by Jean Sacren. |
677 | */ | 679 | */ |
678 | void xfgets(str, size, in) | 680 | void xfgets(char *str, int size, FILE *in) |
679 | char *str; | ||
680 | int size; | ||
681 | FILE *in; | ||
682 | { | 681 | { |
683 | if (fgets(str, size, in) == NULL) | 682 | if (fgets(str, size, in) == NULL) |
684 | fprintf(stderr, "\nError in reading or end of file.\n"); | 683 | fprintf(stderr, "\nError in reading or end of file.\n"); |
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 60ffe8cc83f1..eed22491f13f 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h | |||
@@ -76,9 +76,6 @@ void zconf_nextfile(const char *name); | |||
76 | int zconf_lineno(void); | 76 | int zconf_lineno(void); |
77 | const char *zconf_curname(void); | 77 | const char *zconf_curname(void); |
78 | 78 | ||
79 | /* conf.c */ | ||
80 | void xfgets(char *str, int size, FILE *in); | ||
81 | |||
82 | /* confdata.c */ | 79 | /* confdata.c */ |
83 | const char *conf_get_configname(void); | 80 | const char *conf_get_configname(void); |
84 | const char *conf_get_autoconfig_name(void); | 81 | const char *conf_get_autoconfig_name(void); |