From: Bruno Haible Date: Mon, 12 Nov 2001 12:28:01 +0000 (+0000) Subject: Remove msginit's --verbose option. X-Git-Tag: v0.11~308 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f0606df0047c257e589d50ff4fc401f8c1c327e;p=thirdparty%2Fgettext.git Remove msginit's --verbose option. --- diff --git a/doc/ChangeLog b/doc/ChangeLog index ddd5338fc..111254611 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2001-11-11 Bruno Haible + + * msginit.texi: Remove --verbose documentation. + 2001-08-23 Karl Eichwalder * gettext.texi (Main PO Commands): Reflect po-mode.el key binding diff --git a/doc/msginit.texi b/doc/msginit.texi index abf9b1c68..2038a5862 100644 --- a/doc/msginit.texi +++ b/doc/msginit.texi @@ -58,8 +58,4 @@ Display this help and exit. @itemx --version Output version information and exit. -@item -v -@itemx --verbose -Increase verbosity level. - @end table diff --git a/projects/ChangeLog b/projects/ChangeLog index f4ec55e55..b108c08a5 100644 --- a/projects/ChangeLog +++ b/projects/ChangeLog @@ -1,3 +1,8 @@ +2001-11-11 Bruno Haible + + * team-address: Remove verbose argument. + * KDE/team-address, GNOME/team-address, TP/team-address: Likewise. + 2001-11-08 Bruno Haible * TP/team-address: Show URL diff --git a/projects/GNOME/team-address b/projects/GNOME/team-address index 1e999334a..ed35fa0e3 100755 --- a/projects/GNOME/team-address +++ b/projects/GNOME/team-address @@ -5,7 +5,6 @@ projectsdir="$1" progdir="$2" catalog="$3" # e.g. "pt_BR" language="$4" # e.g. "pt" -verbose="$5" url=`cat "$projectsdir/GNOME/teams.url"` html=`"$progdir/urlget" "$url" "$projectsdir/GNOME/teams.html"` diff --git a/projects/KDE/team-address b/projects/KDE/team-address index a4060f7ff..96d247b60 100755 --- a/projects/KDE/team-address +++ b/projects/KDE/team-address @@ -5,7 +5,6 @@ projectsdir="$1" progdir="$2" catalog="$3" # e.g. "pt_BR" language="$4" # e.g. "pt" -verbose="$5" url=`cat "$projectsdir/KDE/teams.url"` html=`"$progdir/urlget" "$url" "$projectsdir/KDE/teams.html"` diff --git a/projects/TP/team-address b/projects/TP/team-address index 5a42584c1..c177c1ee0 100755 --- a/projects/TP/team-address +++ b/projects/TP/team-address @@ -5,7 +5,6 @@ projectsdir="$1" progdir="$2" catalog="$3" # e.g. "pt_BR" language="$4" # e.g. "pt" -verbose="$5" url=`cat "$projectsdir/TP/teams.url"` html=`"$progdir/urlget" "$url" "$projectsdir/TP/teams.html"` diff --git a/projects/team-address b/projects/team-address index c4e14e0a8..d42236cb7 100755 --- a/projects/team-address +++ b/projects/team-address @@ -5,11 +5,10 @@ projectsdir="$1" progdir="$2" catalog="$3" # e.g. "pt_BR" language="$4" # e.g. "pt" -verbose="$5" for project in `cat "$projectsdir/index"`; do if /bin/sh "$projectsdir/$project/trigger"; then - /bin/sh "$projectsdir/$project/team-address" "$projectsdir" "$progdir" "$catalog" "$language" "$verbose" + /bin/sh "$projectsdir/$project/team-address" "$projectsdir" "$progdir" "$catalog" "$language" exit $? fi done diff --git a/src/ChangeLog b/src/ChangeLog index 5874879ae..ed924bb56 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2001-11-11 Bruno Haible + + * msginit.c (verbose): Remove variable. + (long_options): Remove --verbose. + (main): Remove --verbose option handling. + (usage): Remove --verbose documentation. + (language_team_address): Don't pass a verbose option to the subprocess. + 2001-11-08 Bruno Haible * message.h: New enum value format_smalltalk. diff --git a/src/msginit.c b/src/msginit.c index 3296a6f1d..674bb0959 100644 --- a/src/msginit.c +++ b/src/msginit.c @@ -102,9 +102,6 @@ static const char *catalogname; /* Language (ISO-639 code). */ static const char *language; -/* Verbosity control. */ -static bool verbose; - /* Long options. */ static const struct option long_options[] = { @@ -112,7 +109,6 @@ static const struct option long_options[] = { "input", required_argument, NULL, 'i' }, { "locale", required_argument, NULL, 'l' }, { "output-file", required_argument, NULL, 'o' }, - { "verbose", no_argument, NULL, 'v' }, { "version", no_argument, NULL, 'V' }, { "width", required_argument, NULL, 'w' }, { NULL, 0, NULL, 0 } @@ -190,7 +186,7 @@ main (argc, argv) input_file = NULL; locale = NULL; - while ((opt = getopt_long (argc, argv, "hi:l:o:vVw:", long_options, NULL)) + while ((opt = getopt_long (argc, argv, "hi:l:o:Vw:", long_options, NULL)) != EOF) switch (opt) { @@ -218,10 +214,6 @@ main (argc, argv) output_file = optarg; break; - case 'v': - verbose = true; - break; - case 'V': do_version = true; break; @@ -324,8 +316,7 @@ the output .po file through the --output-file option.\n"), /* Write the modified message list out. */ msgdomain_list_print (result, output_file, true, false); - if (verbose) - fprintf (stderr, "Created %s.\n", output_file); + fprintf (stderr, "Created %s.\n", output_file); exit (EXIT_SUCCESS); } @@ -385,7 +376,6 @@ Output details:\n\ Informative output:\n\ -h, --help display this help and exit\n\ -V, --version output version information and exit\n\ - -v, --verbose increase verbosity level\n\ ")); printf ("\n"); fputs (_("Report bugs to .\n"), @@ -1072,7 +1062,7 @@ static const char * language_team_address () { char *prog = concatenated_pathname (PROJECTSDIR, "team-address", NULL); - char *argv[8]; + char *argv[7]; pid_t child; int fd[1]; FILE *fp; @@ -1088,8 +1078,7 @@ language_team_address () argv[3] = concatenated_pathname (LIBDIR, "gettext", NULL); argv[4] = (char *) catalogname; argv[5] = (char *) language; - argv[6] = (verbose ? "yes" : ""); - argv[7] = NULL; + argv[6] = NULL; child = create_pipe_in (prog, "/bin/sh", argv, "/dev/null", false, true, fd); /* Retrieve its result. */