AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* iconv/iconvconfig.c: Remove --verbose option.  Comment out
	mcheck_verbose call.
This commit is contained in:
Ulrich Drepper 2001-07-22 22:07:20 +00:00
parent 61c037249f
commit 47bd306e41
2 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2001-07-22 Ulrich Drepper <drepper@redhat.com> 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. * iconv/strtab.c (morememory): Fix little memory handling problem.
2001-07-22 Andreas Schwab <schwab@suse.de> 2001-07-22 Andreas Schwab <schwab@suse.de>

43
iconv/iconvconfig.c
View File

@ -105,15 +105,6 @@ struct name_info
static void print_version (FILE *stream, struct argp_state *state); static void print_version (FILE *stream, struct argp_state *state);
void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; 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. */ /* Short description of program. */
static const char doc[] = N_("\ static const char doc[] = N_("\
Create fastloading iconv module configuration file."); Create fastloading iconv module configuration file.");
@ -121,16 +112,13 @@ Create fastloading iconv module configuration file.");
/* Strings for arguments in help texts. */ /* Strings for arguments in help texts. */
static const char args_doc[] = N_("[DIR...]"); 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. */ /* Function to print some extra text in the help message. */
static char *more_help (int key, const char *text, void *input); static char *more_help (int key, const char *text, void *input);
/* Data structure to communicate with argp functions. */ /* Data structure to communicate with argp functions. */
static struct argp argp = 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); static int write_output (void);
/* Nonzero if verbose ouput is wanted. */
static int verbose;
/* Search tree of the modules we know. */ /* Search tree of the modules we know. */
static void *modules; static void *modules;
@ -269,7 +254,8 @@ main (int argc, char *argv[])
char *tp; char *tp;
/* Enable memory use testing. */ /* Enable memory use testing. */
mcheck_pedantic (NULL); /* mcheck_pedantic (NULL); */
mtrace ();
/* Set locale via LC_ALL. */ /* Set locale via LC_ALL. */
setlocale (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 * static char *
more_help (int key, const char *text, void *input) more_help (int key, const char *text, void *input)
{ {
@ -433,6 +403,9 @@ add_alias (char *rp)
return; return;
*wp++ = '\0'; *wp++ = '\0';
assert (strlen (from) + 1 == to - from);
assert (strlen (to) + 1 == wp - to);
new_alias (from, to - from, to, 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); tmp = mempcpy (new_module->filename, filename, filelen);
if (need_ext) if (need_ext)
{ {
memcpy (tmp - 1, gconv_module_ext, sizeof (gconv_module_ext)); memcpy (tmp - 1, gconv_module_ext, need_ext + 1);
filelen += sizeof (gconv_module_ext) - 1; filelen += need_ext;
} }
new_module->directory = directory; new_module->directory = directory;