[Pspp-cvs] pspp ./ChangeLog src/data/data-in.c src/data/da...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/04/16 04:46:41

Modified files:
        .              : ChangeLog 
        src/data       : data-in.c data-out.c filename.c 
                         por-file-reader.c por-file-writer.c 
                         sys-file-reader.c sys-file-writer.c 
        src/language/control: repeat.c 
        src/language/data-io: data-list.c data-reader.c get.c inpt-pgm.c 
                              list.q matrix-data.c 
        src/language/dictionary: apply-dictionary.c formats.c 
                                 missing-values.c numeric.c 
                                 variable-display.c variable-label.c 
        src/language/lexer: q2c.c 
        src/language/stats: correlations.q crosstabs.q frequencies.q 
                            means.q 
        src/language/utilities: title.c 
        src/language/xforms: sample.c 
        src/libpspp    : automake.mk 
        src/math       : sort.c 
        src/output     : manager.c table.c 
        src/ui/terminal: main.c 
Removed files:
        src/libpspp    : debug-print.h 

Log message:
        Get rid of src/libpspp/debug-print.h and all its users.  (There were
        few real users, but many inclusions of its header file.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/ChangeLog.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/data-in.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/data-out.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/filename.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/por-file-reader.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/por-file-writer.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sys-file-reader.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/sys-file-writer.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/control/repeat.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-list.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/data-reader.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/get.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/inpt-pgm.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/list.q.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/matrix-data.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/apply-dictionary.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/formats.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/missing-values.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/numeric.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/variable-display.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/dictionary/variable-label.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/lexer/q2c.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/correlations.q.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/crosstabs.q.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/frequencies.q.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/stats/means.q.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/utilities/title.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/sample.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/libpspp/automake.mk.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/math/sort.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/manager.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/table.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/ui/terminal/main.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: pspp/ChangeLog
diff -u pspp/ChangeLog:1.52 pspp/ChangeLog:1.53
--- pspp/ChangeLog:1.52 Sun Apr 16 02:52:28 2006
+++ pspp/ChangeLog      Sun Apr 16 04:46:41 2006
@@ -1,3 +1,8 @@
+Sat Apr 15 21:45:40 2006  Ben Pfaff  <address@hidden>
+
+       Get rid of src/libpspp/debug-print.h and all its users.  (There
+       were few real users, but many inclusions of its header file.)
+
 Sat Apr 15 19:51:22 2006  Ben Pfaff  <address@hidden>
 
        Get rid of our own int32 type in favor of the standard int32_t
Index: pspp/src/data/data-in.c
diff -u pspp/src/data/data-in.c:1.3 pspp/src/data/data-in.c:1.4
--- pspp/src/data/data-in.c:1.3 Wed Mar 15 03:29:10 2006
+++ pspp/src/data/data-in.c     Sun Apr 16 04:46:41 2006
@@ -39,8 +39,6 @@
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-
-#include <libpspp/debug-print.h>
 
 /* Specialized error routine. */
 
Index: pspp/src/data/data-out.c
diff -u pspp/src/data/data-out.c:1.2 pspp/src/data/data-out.c:1.3
--- pspp/src/data/data-out.c:1.2        Wed Mar 15 03:29:10 2006
+++ pspp/src/data/data-out.c    Sun Apr 16 04:46:41 2006
@@ -36,8 +36,6 @@
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-
-#include <libpspp/debug-print.h>
 
 /* Public functions. */
 
Index: pspp/src/data/filename.c
diff -u pspp/src/data/filename.c:1.7 pspp/src/data/filename.c:1.8
--- pspp/src/data/filename.c:1.7        Sun Apr 16 02:42:39 2006
+++ pspp/src/data/filename.c    Sun Apr 16 04:46:41 2006
@@ -35,8 +35,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* PORTME: Everything in this file is system dependent. */
 
 #ifdef unix
Index: pspp/src/data/por-file-reader.c
diff -u pspp/src/data/por-file-reader.c:1.4 pspp/src/data/por-file-reader.c:1.5
--- pspp/src/data/por-file-reader.c:1.4 Tue Mar 21 00:34:16 2006
+++ pspp/src/data/por-file-reader.c     Sun Apr 16 04:46:41 2006
@@ -47,8 +47,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* portable_to_local[PORTABLE] translates the given portable
    character into the local character set. */
 static const char portable_to_local[256] =
Index: pspp/src/data/por-file-writer.c
diff -u pspp/src/data/por-file-writer.c:1.2 pspp/src/data/por-file-writer.c:1.3
--- pspp/src/data/por-file-writer.c:1.2 Wed Mar 15 03:29:10 2006
+++ pspp/src/data/por-file-writer.c     Sun Apr 16 04:46:41 2006
@@ -47,8 +47,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Portable file writer. */
 struct pfm_writer
   {
Index: pspp/src/data/sys-file-reader.c
diff -u pspp/src/data/sys-file-reader.c:1.6 pspp/src/data/sys-file-reader.c:1.7
--- pspp/src/data/sys-file-reader.c:1.6 Sun Apr 16 02:52:28 2006
+++ pspp/src/data/sys-file-reader.c     Sun Apr 16 04:46:41 2006
@@ -44,8 +44,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* System file reader. */
 struct sfm_reader
   {
Index: pspp/src/data/sys-file-writer.c
diff -u pspp/src/data/sys-file-writer.c:1.4 pspp/src/data/sys-file-writer.c:1.5
--- pspp/src/data/sys-file-writer.c:1.4 Sun Apr 16 02:52:28 2006
+++ pspp/src/data/sys-file-writer.c     Sun Apr 16 04:46:41 2006
@@ -46,8 +46,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Compression bias used by PSPP.  Values between (1 -
    COMPRESSION_BIAS) and (251 - COMPRESSION_BIAS) inclusive can be
    compressed. */
Index: pspp/src/language/control/repeat.c
diff -u pspp/src/language/control/repeat.c:1.4 
pspp/src/language/control/repeat.c:1.5
--- pspp/src/language/control/repeat.c:1.4      Fri Mar 31 00:30:21 2006
+++ pspp/src/language/control/repeat.c  Sun Apr 16 04:46:41 2006
@@ -39,8 +39,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Defines a list of lines used by DO REPEAT. */
 struct line_list
   {
Index: pspp/src/language/data-io/data-list.c
diff -u pspp/src/language/data-io/data-list.c:1.6 
pspp/src/language/data-io/data-list.c:1.7
--- pspp/src/language/data-io/data-list.c:1.6   Sun Apr 16 01:05:15 2006
+++ pspp/src/language/data-io/data-list.c       Sun Apr 16 04:46:41 2006
@@ -29,7 +29,6 @@
 #include <language/command.h>
 #include <libpspp/compiler.h>
 #include <data/data-in.h>
-#include <libpspp/debug-print.h>
 #include <language/data-io/data-reader.h>
 #include <data/dictionary.h>
 #include <libpspp/message.h>
Index: pspp/src/language/data-io/data-reader.c
diff -u pspp/src/language/data-io/data-reader.c:1.4 
pspp/src/language/data-io/data-reader.c:1.5
--- pspp/src/language/data-io/data-reader.c:1.4 Sun Apr 16 02:42:39 2006
+++ pspp/src/language/data-io/data-reader.c     Sun Apr 16 04:46:41 2006
@@ -37,8 +37,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Flags for DFM readers. */
 enum dfm_reader_flags
   {
Index: pspp/src/language/data-io/get.c
diff -u pspp/src/language/data-io/get.c:1.3 pspp/src/language/data-io/get.c:1.4
--- pspp/src/language/data-io/get.c:1.3 Wed Mar 15 03:29:10 2006
+++ pspp/src/language/data-io/get.c     Sun Apr 16 04:46:41 2006
@@ -43,8 +43,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Rearranging and reducing a dictionary. */
 static void start_case_map (struct dictionary *);
 static struct case_map *finish_case_map (struct dictionary *);
@@ -735,8 +733,6 @@
 
 /* MATCH FILES. */
 
-#include <libpspp/debug-print.h>
-
 /* File types. */
 enum
   {
Index: pspp/src/language/data-io/inpt-pgm.c
diff -u pspp/src/language/data-io/inpt-pgm.c:1.3 
pspp/src/language/data-io/inpt-pgm.c:1.4
--- pspp/src/language/data-io/inpt-pgm.c:1.3    Wed Mar 15 03:29:10 2006
+++ pspp/src/language/data-io/inpt-pgm.c        Sun Apr 16 04:46:41 2006
@@ -40,8 +40,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Indicates how a `union value' should be initialized. */
 enum value_init_type
   {
Index: pspp/src/language/data-io/list.q
diff -u pspp/src/language/data-io/list.q:1.5 
pspp/src/language/data-io/list.q:1.6
--- pspp/src/language/data-io/list.q:1.5        Mon Apr  3 20:07:54 2006
+++ pspp/src/language/data-io/list.q    Sun Apr 16 04:46:41 2006
@@ -45,8 +45,6 @@
 
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 /* (specification)
    list (lst_):
      *variables=varlist("PV_NO_SCRATCH");
Index: pspp/src/language/data-io/matrix-data.c
diff -u pspp/src/language/data-io/matrix-data.c:1.3 
pspp/src/language/data-io/matrix-data.c:1.4
--- pspp/src/language/data-io/matrix-data.c:1.3 Wed Mar 15 03:29:10 2006
+++ pspp/src/language/data-io/matrix-data.c     Sun Apr 16 04:46:41 2006
@@ -42,8 +42,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* FIXME: /N subcommand not implemented.  It should be pretty simple,
    too. */
 
@@ -1123,7 +1121,6 @@
        if (mx->fmt != FREE
             && !force_eol (mx->reader, content_names[content]))
          return 0;
-       debug_printf (("\n"));
       }
 
       if (mx->section == LOWER)
@@ -1419,11 +1416,8 @@
            size_t factor;
 
            for (factor = 0; factor < mx->n_factors; factor++)
-             {
-               case_data_rw (c, mx->factors[factor]->fv)->f
-                 = nr->factor_values[factor + cell * mx->n_factors];
-               debug_printf (("f:%s ", mx->factors[factor]->name));
-             }
+              case_data_rw (c, mx->factors[factor]->fv)->f
+                = nr->factor_values[factor + cell * mx->n_factors];
          }
          
          {
@@ -1973,8 +1967,6 @@
     }
   c->n_rows[wr->content]++;
 
-  debug_printf ((" (c=%p,r=%d,n=%d)", c, n_rows + 1, n_cols));
-
   /* Read N_COLS items at CP. */
   {
     int j;
@@ -1997,7 +1989,6 @@
     if (mx->fmt != FREE
         && !force_eol (mx->reader, content_names[wr->content]))
       return 0;
-    debug_printf (("\n"));
   }
 
   return 1;
Index: pspp/src/language/dictionary/apply-dictionary.c
diff -u pspp/src/language/dictionary/apply-dictionary.c:1.3 
pspp/src/language/dictionary/apply-dictionary.c:1.4
--- pspp/src/language/dictionary/apply-dictionary.c:1.3 Sun Apr 16 01:05:15 2006
+++ pspp/src/language/dictionary/apply-dictionary.c     Sun Apr 16 04:46:41 2006
@@ -34,8 +34,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Parses and executes APPLY DICTIONARY. */
 int
 cmd_apply_dictionary (void)
Index: pspp/src/language/dictionary/formats.c
diff -u pspp/src/language/dictionary/formats.c:1.2 
pspp/src/language/dictionary/formats.c:1.3
--- pspp/src/language/dictionary/formats.c:1.2  Wed Mar 15 03:29:10 2006
+++ pspp/src/language/dictionary/formats.c      Sun Apr 16 04:46:41 2006
@@ -31,8 +31,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 enum
   {
     FORMATS_PRINT = 001,
Index: pspp/src/language/dictionary/missing-values.c
diff -u pspp/src/language/dictionary/missing-values.c:1.2 
pspp/src/language/dictionary/missing-values.c:1.3
--- pspp/src/language/dictionary/missing-values.c:1.2   Wed Mar 15 03:29:10 2006
+++ pspp/src/language/dictionary/missing-values.c       Sun Apr 16 04:46:41 2006
@@ -32,8 +32,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 int
 cmd_missing_values (void)
 {
Index: pspp/src/language/dictionary/numeric.c
diff -u pspp/src/language/dictionary/numeric.c:1.2 
pspp/src/language/dictionary/numeric.c:1.3
--- pspp/src/language/dictionary/numeric.c:1.2  Wed Mar 15 03:29:10 2006
+++ pspp/src/language/dictionary/numeric.c      Sun Apr 16 04:46:41 2006
@@ -30,8 +30,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Parses the NUMERIC command. */
 int
 cmd_numeric (void)
Index: pspp/src/language/dictionary/variable-display.c
diff -u pspp/src/language/dictionary/variable-display.c:1.2 
pspp/src/language/dictionary/variable-display.c:1.3
--- pspp/src/language/dictionary/variable-display.c:1.2 Wed Mar 15 03:29:10 2006
+++ pspp/src/language/dictionary/variable-display.c     Sun Apr 16 04:46:41 2006
@@ -27,8 +27,6 @@
 #include <libpspp/str.h>
 #include <data/variable.h>
 
-#include <libpspp/debug-print.h>
-
 /* Set variables' alignment
    This is the alignment for GUI display only.
    It affects nothing but GUIs
Index: pspp/src/language/dictionary/variable-label.c
diff -u pspp/src/language/dictionary/variable-label.c:1.2 
pspp/src/language/dictionary/variable-label.c:1.3
--- pspp/src/language/dictionary/variable-label.c:1.2   Wed Mar 15 03:29:10 2006
+++ pspp/src/language/dictionary/variable-label.c       Sun Apr 16 04:46:41 2006
@@ -30,8 +30,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 int
 cmd_variable_labels (void)
 {
Index: pspp/src/language/lexer/q2c.c
diff -u pspp/src/language/lexer/q2c.c:1.6 pspp/src/language/lexer/q2c.c:1.7
--- pspp/src/language/lexer/q2c.c:1.6   Sat Apr 15 21:31:29 2006
+++ pspp/src/language/lexer/q2c.c       Sun Apr 16 04:46:41 2006
@@ -41,8 +41,6 @@
 #endif
 
      
-#include <libpspp/debug-print.h>
-
 /* Max length of an input line. */
 #define MAX_LINE_LEN 1024
 
Index: pspp/src/language/stats/correlations.q
diff -u pspp/src/language/stats/correlations.q:1.4 
pspp/src/language/stats/correlations.q:1.5
--- pspp/src/language/stats/correlations.q:1.4  Sun Apr 16 01:05:15 2006
+++ pspp/src/language/stats/correlations.q      Sun Apr 16 04:46:41 2006
@@ -29,8 +29,6 @@
 #include <data/variable.h>
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 struct cor_set
   {
     struct cor_set *next;
Index: pspp/src/language/stats/crosstabs.q
diff -u pspp/src/language/stats/crosstabs.q:1.5 
pspp/src/language/stats/crosstabs.q:1.6
--- pspp/src/language/stats/crosstabs.q:1.5     Mon Apr  3 20:07:54 2006
+++ pspp/src/language/stats/crosstabs.q Sun Apr 16 04:46:41 2006
@@ -60,8 +60,6 @@
 
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 /* (specification)
    crosstabs (crs_):
      *^tables=custom;
Index: pspp/src/language/stats/frequencies.q
diff -u pspp/src/language/stats/frequencies.q:1.5 
pspp/src/language/stats/frequencies.q:1.6
--- pspp/src/language/stats/frequencies.q:1.5   Sun Apr 16 01:05:15 2006
+++ pspp/src/language/stats/frequencies.q       Sun Apr 16 04:46:41 2006
@@ -62,8 +62,6 @@
 
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 /* (specification)
    FREQUENCIES (frq_):
      *variables=custom;
Index: pspp/src/language/stats/means.q
diff -u pspp/src/language/stats/means.q:1.2 pspp/src/language/stats/means.q:1.3
--- pspp/src/language/stats/means.q:1.2 Wed Mar 15 03:29:11 2006
+++ pspp/src/language/stats/means.q     Sun Apr 16 04:46:41 2006
@@ -35,8 +35,6 @@
 
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 /* (specification)
    means (mns_):
      *tables=custom;
Index: pspp/src/language/utilities/title.c
diff -u pspp/src/language/utilities/title.c:1.2 
pspp/src/language/utilities/title.c:1.3
--- pspp/src/language/utilities/title.c:1.2     Wed Mar 15 03:29:11 2006
+++ pspp/src/language/utilities/title.c Sun Apr 16 04:46:41 2006
@@ -34,8 +34,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 static int get_title (const char *cmd, char **title);
 
 int
@@ -56,7 +54,6 @@
   int c;
 
   c = lex_look_ahead ();
-  debug_printf ((_("%s before: %s\n"), cmd, *title ? *title : _("<none>")));
   if (c == '"' || c == '\'')
     {
       lex_get ();
@@ -84,7 +81,6 @@
        *cp = toupper ((unsigned char) (*cp));
       token = '.';
     }
-  debug_printf ((_("%s after: %s\n"), cmd, *title));
   return CMD_SUCCESS;
 }
 
Index: pspp/src/language/xforms/sample.c
diff -u pspp/src/language/xforms/sample.c:1.3 
pspp/src/language/xforms/sample.c:1.4
--- pspp/src/language/xforms/sample.c:1.3       Wed Mar 15 03:29:11 2006
+++ pspp/src/language/xforms/sample.c   Sun Apr 16 04:46:41 2006
@@ -34,8 +34,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* The two different types of samples. */
 enum
   {
Index: pspp/src/libpspp/automake.mk
diff -u pspp/src/libpspp/automake.mk:1.4 pspp/src/libpspp/automake.mk:1.5
--- pspp/src/libpspp/automake.mk:1.4    Fri Mar 31 18:38:59 2006
+++ pspp/src/libpspp/automake.mk        Sun Apr 16 04:46:41 2006
@@ -12,7 +12,6 @@
        src/libpspp/copyleft.c \
        src/libpspp/copyleft.h \
        src/libpspp/compiler.h \
-       src/libpspp/debug-print.h \
        src/libpspp/freaderror.c \
        src/libpspp/freaderror.h \
        src/libpspp/hash.c \
Index: pspp/src/math/sort.c
diff -u pspp/src/math/sort.c:1.3 pspp/src/math/sort.c:1.4
--- pspp/src/math/sort.c:1.3    Sun Apr 16 01:05:15 2006
+++ pspp/src/math/sort.c        Sun Apr 16 04:46:41 2006
@@ -41,8 +41,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* These should only be changed for testing purposes. */
 int min_buffers = 64;
 int max_buffers = INT_MAX;
Index: pspp/src/output/manager.c
diff -u pspp/src/output/manager.c:1.4 pspp/src/output/manager.c:1.5
--- pspp/src/output/manager.c:1.4       Mon Apr  3 20:07:54 2006
+++ pspp/src/output/manager.c   Sun Apr 16 04:46:41 2006
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "output.h"
-#include <libpspp/debug-print.h>
 
 /* Table. */
 int table_num = 1;
Index: pspp/src/output/table.c
diff -u pspp/src/output/table.c:1.5 pspp/src/output/table.c:1.6
--- pspp/src/output/table.c:1.5 Mon Apr  3 20:07:54 2006
+++ pspp/src/output/table.c     Sun Apr 16 04:46:41 2006
@@ -37,8 +37,6 @@
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-
-#include <libpspp/debug-print.h>
 
 struct som_table_class tab_table_class;
 static char *command_name;
Index: pspp/src/ui/terminal/main.c
diff -u pspp/src/ui/terminal/main.c:1.3 pspp/src/ui/terminal/main.c:1.4
--- pspp/src/ui/terminal/main.c:1.3     Wed Mar 15 03:29:11 2006
+++ pspp/src/ui/terminal/main.c Sun Apr 16 04:46:41 2006
@@ -55,8 +55,6 @@
 
 #include <stdlib.h>
 
-#include <libpspp/debug-print.h>
-
 static void i18n_init (void);
 static void fpu_init (void);
 static void handle_error (int code);