verbose-msg: Remove.

This feature is not used very much and in fact is really only useful at all
because it is difficult to understand how PSPP configuration works.
Upcoming commits will make PSPP configuration much simpler, so we drop it
now to simplify the code in advance.

diff --git a/doc/invoking.texi b/doc/invoking.texi
index 3052162fddbfac4af381b3e3e1966c7f3e0704f8..2b8a521d60f1f67ede76d989824dde2d23e51287 100644 (file)
--- a/doc/invoking.texi
+++ b/doc/invoking.texi
@@ -41,7 +41,7 @@ pspp [ -B @var{dir} | --config-dir=@var{dir} ] [ -o @var{device} | --device=@var
        [ -I @var{dir} | --include=@var{dir} ] [ -i | --interactive ] 
        [ -r | --no-statrc ] [ -h | --help ] [ -l | --list ] 
        [ -s | --safer ]
-       [ --testing-mode ] [ -V | --version ] [ -v | --verbose ] 
+       [ --testing-mode ] [ -V | --version ]
        [ @var{key}=@var{value} ] @var{file}@enddots{}
 @end example
 
@@ -213,44 +213,6 @@ Prints a brief message listing PSPP's version, warranties you don't
 have, copying conditions and copyright, and e-mail address for bug
 reports, then terminates.
 
-@item -v
-@item --verbose
-
-Increments PSPP's verbosity level.  Higher verbosity levels cause
-PSPP to display greater amounts of information about what it is
-doing.  Often useful for debugging PSPP's configuration.  
-
-This option can be given multiple times to set the verbosity level to
-that value.  The default verbosity level is 0, in which no informational
-messages will be displayed.
-
-Higher verbosity levels cause messages to be displayed when the
-corresponding events take place.
-
-@table @asis
-@item 1
-
-Driver and subsystem initializations.
-
-@item 2
-
-Completion of driver initializations.  Beginning of driver closings.
-
-@item 3
-
-Completion of driver closings.
-
-@item 4
-
-Files searched for; success of searches.
-
-@item 5
-
-Individual directories included in file searches.
-@end table
-
-Each verbosity level also includes messages from lower verbosity levels.
-
 @end table
 
 

diff --git a/src/data/file-name.c b/src/data/file-name.c
index cf58b6db1a24a27cb0f38b7d8b79417e62be4ef5..d8defd1dcc7e2152344c4ecf15382f83e0925a77 100644 (file)
--- a/src/data/file-name.c
+++ b/src/data/file-name.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,7 +34,6 @@
 #include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
-#include <libpspp/verbose-msg.h>
 #include <libpspp/version.h>
 
 #include "xalloc.h"
@@ -132,8 +131,6 @@ fn_search_path (const char *base_name, const char *path_)
   ds_init_cstr (&path, path_);
   fn_interp_vars (ds_ss (&path), insert_env_var, NULL, &path);
 
-  verbose_msg (2, _("searching for \"%s\" in path \"%s\""),
-               base_name, ds_cstr (&path));
   while (ds_separate (&path, ss_cstr (":"), &save_idx, &dir))
     {
       /* Construct file name. */
@@ -147,14 +144,12 @@ fn_search_path (const char *base_name, const char *path_)
       /* Check whether file exists. */
       if (fn_exists (ds_cstr (&file)))
        {
-         verbose_msg (2, _("...found \"%s\""), ds_cstr (&file));
           ds_destroy (&path);
          return ds_cstr (&file);
        }
     }
 
   /* Failure. */
-  verbose_msg (2, _("...not found"));
   ds_destroy (&path);
   ds_destroy (&file);
   return NULL;

diff --git a/src/language/prompt.c b/src/language/prompt.c
index 34690d503d960d491c427e1e44f01b565651966b..ede6a5e3b9c8c76d5b5d249113bc2537e3cff82d 100644 (file)
--- a/src/language/prompt.c
+++ b/src/language/prompt.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,7 +31,6 @@
 #include <libpspp/message.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
-#include <libpspp/verbose-msg.h>
 #include <libpspp/version.h>
 #include <output/tab.h>
 

diff --git a/src/language/syntax-file.c b/src/language/syntax-file.c
index 9470e5083ebd2fcf3e668393029d3eaa1ff6df36..ad277b5859dec12b1125a4a6b0ac40329a6d2a50 100644 (file)
--- a/src/language/syntax-file.c
+++ b/src/language/syntax-file.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@
 #include <libpspp/message.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
-#include <libpspp/verbose-msg.h>
 #include <libpspp/version.h>
 #include <output/tab.h>
 
@@ -89,7 +88,6 @@ read_syntax_file (struct getl_interface *s,
   /* Open file, if not yet opened. */
   if (sfs->syntax_file == NULL)
     {
-      verbose_msg (1, _("opening \"%s\" as syntax file"), sfs->fn);
       sfs->syntax_file = fn_open (sfs->fn, "r");
 
       if (sfs->syntax_file == NULL)

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 59ac613dc0176e75b4a86e69140e926e5255fbbe..2795dc201aa946d22e9998b69ce6fd2269f4c8ce 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -80,8 +80,6 @@ src_libpspp_libpspp_la_SOURCES = \
        src/libpspp/tmpfile.h \
        src/libpspp/tower.c \
        src/libpspp/tower.h \
-       src/libpspp/verbose-msg.c \
-       src/libpspp/verbose-msg.h \
        src/libpspp/version.h 
 
 DISTCLEANFILES+=src/libpspp/version.c

diff --git a/src/libpspp/verbose-msg.c b/src/libpspp/verbose-msg.c
deleted file mode 100644 (file)
index a65db7d..0000000
--- a/src/libpspp/verbose-msg.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include <libpspp/verbose-msg.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "progname.h"
-
-/* Level of verbosity.
-   Higher values cause more output. */
-static int verbosity;
-
-/* Increases the verbosity level. */
-void
-verbose_increment_level (void)
-{
-  verbosity++;
-}
-
-/* Writes MESSAGE formatted with printf, to stderr, if the
-   verbosity level is at least LEVEL. */
-void
-verbose_msg (int level, const char *format, ...)
-{
-  if (level <= verbosity)
-    {
-      va_list args;
-
-      va_start (args, format);
-      fprintf (stderr, "%s: ", program_name);
-      vfprintf (stderr, format, args);
-      putc ('\n', stderr);
-      va_end (args);
-    }
-}
-

diff --git a/src/libpspp/verbose-msg.h b/src/libpspp/verbose-msg.h
deleted file mode 100644 (file)
index 2a19331..0000000
--- a/src/libpspp/verbose-msg.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef VERBOSE_MSG_H
-#define VERBOSE_MSG_H 1
-
-#include <libpspp/compiler.h>
-
-void verbose_increment_level (void);
-void verbose_msg (int level, const char *format, ...)
-     PRINTF_FORMAT (2, 3);
-
-#endif /* verbose-msg.h */

diff --git a/src/ui/terminal/terminal-opts.c b/src/ui/terminal/terminal-opts.c
index 955a6b0e9c7fda53e2daa1a9b67e9b528f2189bd..c55dc57fd20b994c5e524e2717a4c8a5c106e034 100644 (file)
--- a/src/ui/terminal/terminal-opts.c
+++ b/src/ui/terminal/terminal-opts.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008  Free Software Foundation
+   Copyright (C) 2008, 2010  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include <libpspp/llx.h>
 #include <libpspp/string-map.h>
 #include <libpspp/string-set.h>
-#include <libpspp/verbose-msg.h>
 #include <output/driver.h>
 #include <ui/command-line.h>
 #include <ui/terminal/msg-ui.h>
@@ -44,7 +43,6 @@
 
 static const struct argp_option test_options [] =
   {
-    {"verbose", 'v', 0, 0, N_("Increase diagnostic verbosity level"), 0},
     {"testing-mode", 'T', 0, OPTION_HIDDEN, 0, 0},
 
     { 0, 0, 0, 0, 0, 0 }
@@ -58,9 +56,6 @@ parse_test_opts (int key, char *arg, struct argp_state *state)
     case 'T':
       settings_set_testing_mode (true);
       break;
-    case 'v':
-      verbose_increment_level ();
-      break;
     default:
       return ARGP_ERR_UNKNOWN;
     }