Remove msginit's --verbose option.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index ddd5338fce0761e8d60eeebed37f716522e6292d..1112546119f6ff5f717bf978f21c461f6ee226e9 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-11  Bruno Haible  <haible@clisp.cons.org>
+
+       * msginit.texi: Remove --verbose documentation.
+
 2001-08-23  Karl Eichwalder  <ke@suse.de>
 
        * gettext.texi (Main PO Commands): Reflect po-mode.el key binding

diff --git a/doc/msginit.texi b/doc/msginit.texi
index abf9b1c682790a02acf5c4695ac0c523421ba29b..2038a5862771e2030f2b67397f73fffb522c04f5 100644 (file)
--- 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 f4ec55e558bba11057567c17e5cd0c93c9e497bc..b108c08a5d43f47cfbff6bb67320b3533c4802c8 100644 (file)
--- a/projects/ChangeLog
+++ b/projects/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-11  Bruno Haible  <haible@clisp.cons.org>
+
+       * team-address: Remove verbose argument.
+       * KDE/team-address, GNOME/team-address, TP/team-address: Likewise.
+
 2001-11-08  Bruno Haible  <haible@clisp.cons.org>
 
        * TP/team-address: Show URL

diff --git a/projects/GNOME/team-address b/projects/GNOME/team-address
index 1e999334af36db7d55847d9ea5a3642c66c37312..ed35fa0e31134b5ca8b3358b2fefa2a71ebc7030 100755 (executable)
--- 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 a4060f7ff607f3434d675356144e8b8d81807f08..96d247b6077ea425d3ba0398c6223399c7b8832b 100755 (executable)
--- 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 5a42584c15596a5395f754297dd4443486547a8e..c177c1ee0d441b11c65edd25ee6e4e15aac3153e 100755 (executable)
--- 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 c4e14e0a8ffc415696888dbaefe5270d7a4c7e74..d42236cb70c89cc375b2ca28275497c1e0a3e6fe 100755 (executable)
--- 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 5874879aece38bbb5f3de357e3d84143dbbeba7e..ed924bb56050e71b38a60c0d7b06f50ea83705d6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-11  Bruno Haible  <haible@clisp.cons.org>
+
+       * 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  <haible@clisp.cons.org>
 
        * message.h: New enum value format_smalltalk.

diff --git a/src/msginit.c b/src/msginit.c
index 3296a6f1d437ad0d00c1287bc5ab713c08e70269..674bb09592a3c42c17fd366ce22997b7db76fdab 100644 (file)
--- 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 <bug-gnu-gettext@gnu.org>.\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.  */