summaryrefslogtreecommitdiffstats
path: root/libidu/scanners.c
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-05-11 08:47:35 +0200
committerJim Meyering <meyering@redhat.com>2008-05-17 12:53:29 +0200
commit440e6f0cf9c8421ccd4576171d0c8b916cd681f0 (patch)
treed5a3664f5e2b8c50027eec3c5f11a041c09a4765 /libidu/scanners.c
parentff085957e84f5789871521a11b44afa27a48d72d (diff)
downloadidutils-440e6f0cf9c8421ccd4576171d0c8b916cd681f0.tar.gz
idutils-440e6f0cf9c8421ccd4576171d0c8b916cd681f0.tar.bz2
idutils-440e6f0cf9c8421ccd4576171d0c8b916cd681f0.zip
tighten scope in libidu/, too
Mark with "extern" the symbols that belong that way. Make the others static. * libidu/dynvec.h (dv_fill): * libidu/fnprint.c (cw_dlink): * libidu/hash.h (qsort_cmp_t): * libidu/idfile.h (io_func_t): * libidu/scanners.c (lang_args_obstack, languages_0, languages_N): (language_help_me, language_getopt, get_language): (lang_args_index): * libidu/walker.c (largest_member_file): * maint.mk (extract_char, today): * src/fid.c (long_options): * src/fnid.c (cw_dlink): * src/lid.c (cw_dlink): * src/xtokid.c (cw_dlink):
Diffstat (limited to 'libidu/scanners.c')
-rw-r--r--libidu/scanners.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/libidu/scanners.c b/libidu/scanners.c
index 9633c4d..92130dc 100644
--- a/libidu/scanners.c
+++ b/libidu/scanners.c
@@ -36,7 +36,7 @@
#include "tokflags.h"
#include "iduglobal.h"
-struct obstack lang_args_obstack;
+static struct obstack lang_args_obstack;
struct lang_args *lang_args_default = 0;
struct lang_args *lang_args_list = 0;
struct obstack tokens_obstack;
@@ -74,7 +74,7 @@ static struct token *get_token_lisp (FILE *in_FILE, void const *args, int *flags
static void *parse_args_lisp (char **argv, int argc);
static void help_me_lisp (void);
-struct language languages_0[] =
+static const struct language const languages_0[] =
{
{ "C", parse_args_c, get_token_c, help_me_c },
{ "C++", parse_args_c, get_token_c, help_me_cpp },
@@ -84,12 +84,13 @@ struct language languages_0[] =
{ "perl", parse_args_perl, get_token_perl, help_me_perl },
{ "lisp", parse_args_lisp, get_token_lisp, help_me_lisp }
};
-struct language const *languages_N = &languages_0[cardinalityof (languages_0)];
+static struct language const *languages_N
+ = &languages_0[cardinalityof (languages_0)];
void
language_help_me (void)
{
- struct language *lang;
+ const struct language *lang;
for (lang = languages_0; lang < languages_N; lang++)
{
putchar ('\n');
@@ -117,23 +118,21 @@ language_save_arg (char *arg)
void
language_getopt (void)
{
- struct language *lang;
-
+ const struct language *lang;
for (lang = languages_0; lang < languages_N; lang++)
if (lang->lg_argc)
- lang->lg_parse_args (lang->lg_argv, lang->lg_argc);
+ lang->lg_parse_args ((char**)(lang->lg_argv), lang->lg_argc);
}
struct language *
get_language (char const *lang_name)
{
- struct language *lang;
-
+ const struct language *lang;
for (lang = languages_0; lang < languages_N; lang++)
if (strequ (lang_name, lang->lg_name))
{
DEBUG (("lang=%s", lang_name));
- return lang;
+ return (struct language *) lang;
}
DEBUG (("!lang=%s", lang_name));
return 0;
@@ -141,7 +140,7 @@ get_language (char const *lang_name)
/****************************************************************************/
-int lang_args_index = 0;
+static int lang_args_index = 0;
void
set_default_language (char const *lang_name)