aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-07-22 22:07:20 +0000
committerUlrich Drepper <drepper@redhat.com>2001-07-22 22:07:20 +0000
commit47bd306e41f556b29160b8ff9b47319f0876de36 (patch)
tree49b722cac927e0237376c7a180f68824566ebe47
parent61c037249fe1e2bb62e596d47bd49e3b30e5ca32 (diff)
downloadglibc-47bd306e41f556b29160b8ff9b47319f0876de36.tar
glibc-47bd306e41f556b29160b8ff9b47319f0876de36.tar.gz
glibc-47bd306e41f556b29160b8ff9b47319f0876de36.tar.bz2
glibc-47bd306e41f556b29160b8ff9b47319f0876de36.zip
Update.
* iconv/iconvconfig.c: Remove --verbose option. Comment out mcheck_verbose call.
-rw-r--r--ChangeLog3
-rw-r--r--iconv/iconvconfig.c43
2 files changed, 11 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index f0bd8d547a..3ed611e340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2001-07-22 Ulrich Drepper <drepper@redhat.com>
+ * iconv/iconvconfig.c: Remove --verbose option. Comment out
+ mcheck_verbose call.
+
* iconv/strtab.c (morememory): Fix little memory handling problem.
2001-07-22 Andreas Schwab <schwab@suse.de>
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index 3daf65f858..a6a9bc7aa3 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -105,15 +105,6 @@ struct name_info
static void print_version (FILE *stream, struct argp_state *state);
void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
-#define OPT_VERBOSE 1000
-
-/* Definitions of arguments for argp functions. */
-static const struct argp_option options[] =
-{
- { "verbose", OPT_VERBOSE, NULL, 0, N_("print progress information") },
- { NULL, 0, NULL, 0, NULL }
-};
-
/* Short description of program. */
static const char doc[] = N_("\
Create fastloading iconv module configuration file.");
@@ -121,16 +112,13 @@ Create fastloading iconv module configuration file.");
/* Strings for arguments in help texts. */
static const char args_doc[] = N_("[DIR...]");
-/* Prototype for option handler. */
-static error_t parse_opt (int key, char *arg, struct argp_state *state);
-
/* Function to print some extra text in the help message. */
static char *more_help (int key, const char *text, void *input);
/* Data structure to communicate with argp functions. */
static struct argp argp =
{
- options, parse_opt, args_doc, doc, NULL, more_help
+ NULL, NULL, args_doc, doc, NULL, more_help
};
@@ -156,9 +144,6 @@ static void generate_name_info (void);
static int write_output (void);
-/* Nonzero if verbose ouput is wanted. */
-static int verbose;
-
/* Search tree of the modules we know. */
static void *modules;
@@ -269,7 +254,8 @@ main (int argc, char *argv[])
char *tp;
/* Enable memory use testing. */
- mcheck_pedantic (NULL);
+ /* mcheck_pedantic (NULL); */
+ mtrace ();
/* Set locale via LC_ALL. */
setlocale (LC_ALL, "");
@@ -321,22 +307,6 @@ main (int argc, char *argv[])
}
-/* Handle program arguments. */
-static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
-{
- switch (key)
- {
- case OPT_VERBOSE:
- verbose = 1;
- break;
- default:
- return ARGP_ERR_UNKNOWN;
- }
- return 0;
-}
-
-
static char *
more_help (int key, const char *text, void *input)
{
@@ -433,6 +403,9 @@ add_alias (char *rp)
return;
*wp++ = '\0';
+ assert (strlen (from) + 1 == to - from);
+ assert (strlen (to) + 1 == wp - to);
+
new_alias (from, to - from, to, wp - to);
}
@@ -502,8 +475,8 @@ new_module (const char *fromname, size_t fromlen, const char *toname,
tmp = mempcpy (new_module->filename, filename, filelen);
if (need_ext)
{
- memcpy (tmp - 1, gconv_module_ext, sizeof (gconv_module_ext));
- filelen += sizeof (gconv_module_ext) - 1;
+ memcpy (tmp - 1, gconv_module_ext, need_ext + 1);
+ filelen += need_ext;
}
new_module->directory = directory;