Get rid of src/libpspp/debug-print.h and all its users. (There were

few real users, but many inclusions of its header file.)

diff --git a/ChangeLog b/ChangeLog
index 6f1daa73bca163657cc5eb8dbe6564bc491c4b41..8502ffae6014a6af06c2648928dc005064edb363 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 15 21:45:40 2006  Ben Pfaff  <blp@gnu.org>
+
+       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  <blp@gnu.org>
 
        Get rid of our own int32 type in favor of the standard int32_t

diff --git a/src/data/data-in.c b/src/data/data-in.c
index cc3a3e40775d63f134bbe71095ad82593ca59fc9..44fd7995f632ad86b092007fdfefa257adca3a84 100644 (file)
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -39,8 +39,6 @@
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-
-#include <libpspp/debug-print.h>
 \f
 /* Specialized error routine. */
 

diff --git a/src/data/data-out.c b/src/data/data-out.c
index 79c7042446abb453c2c1722b118303805dd5b217..78668b7aed96685b52b6934f277239e36dd92dab 100644 (file)
--- a/src/data/data-out.c
+++ b/src/data/data-out.c
@@ -36,8 +36,6 @@
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-
-#include <libpspp/debug-print.h>
 \f
 /* Public functions. */
 

diff --git a/src/data/filename.c b/src/data/filename.c
index d81dd0762e4e94e3882357359236383ec44a5393..cbfc04ceab3ebf351477708d09048c4108b2e42b 100644 (file)
--- a/src/data/filename.c
+++ b/src/data/filename.c
@@ -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

diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c
index c4fec4b0ed72d30a2608c9b6af49340d35d40384..3f385223e5afe74f277b6bb4e105a659902a4aec 100644 (file)
--- a/src/data/por-file-reader.c
+++ b/src/data/por-file-reader.c
@@ -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] =

diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c
index c7c7dd2f211672a68a0cbe5866599b481816f849..98b7b76426fb0596c3577416b6572ce296544d0f 100644 (file)
--- a/src/data/por-file-writer.c
+++ b/src/data/por-file-writer.c
@@ -47,8 +47,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Portable file writer. */
 struct pfm_writer
   {

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 5f3e26bdb6134787023fd267fb20f17f71ec5ea9..58a885ae4a4be3e4b97f5ab2e6bd800fe395951c 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -44,8 +44,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* System file reader. */
 struct sfm_reader
   {

diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c
index 21b06139fe00e39a3d12ec32a22585765708962f..5ba525cbfed518edd7af6bcc1cb5ec7c443db429 100644 (file)
--- a/src/data/sys-file-writer.c
+++ b/src/data/sys-file-writer.c
@@ -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. */

diff --git a/src/language/control/repeat.c b/src/language/control/repeat.c
index 6cfbb6bba5cbc3ff911f81c09b3828488c8bcb52..933c9134bfcb5c8c37bdbd8d651737b07d002655 100644 (file)
--- a/src/language/control/repeat.c
+++ b/src/language/control/repeat.c
@@ -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
   {

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index db7fc3bf8d5994853f75ab49b44513a28d35a63f..6609e32b91b120badaac966fae443cd76b5fcbe0 100644 (file)
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -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>

diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c
index 0a4baf6774fc48f0bb8e146a96bf7a7cab538e7c..8d9dd2074d517826de859c4f31a9766aba6586f3 100644 (file)
--- a/src/language/data-io/data-reader.c
+++ b/src/language/data-io/data-reader.c
@@ -37,8 +37,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Flags for DFM readers. */
 enum dfm_reader_flags
   {

diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c
index 052dbeabbbd63931189aa120c833fb0ffb451a9c..78e91c3dde7269f2450265f7c4b1c47fa528d663 100644 (file)
--- a/src/language/data-io/get.c
+++ b/src/language/data-io/get.c
@@ -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 @@ keep_variables (struct dictionary *dict)
 \f
 /* MATCH FILES. */
 
-#include <libpspp/debug-print.h>
-
 /* File types. */
 enum
   {

diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c
index 06b6c38625b12ef218ead57c11effc9479aee473..1fcf0f0963a66780df88498ff89d84a6f66fe41a 100644 (file)
--- a/src/language/data-io/inpt-pgm.c
+++ b/src/language/data-io/inpt-pgm.c
@@ -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
   {

diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q
index b212efeb308ae63ee86b6577220ccf365e0ba32d..4e1f8a18c3b65efb25606e6e5926aa9e76e97cc6 100644 (file)
--- a/src/language/data-io/list.q
+++ b/src/language/data-io/list.q
@@ -45,8 +45,6 @@
 
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 /* (specification)
    list (lst_):
      *variables=varlist("PV_NO_SCRATCH");

diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c
index 8dc3f00a929ccab93b62b55d980cd1dff19dc4de..4db8f90a61427de8033897160990481df131c607 100644 (file)
--- a/src/language/data-io/matrix-data.c
+++ b/src/language/data-io/matrix-data.c
@@ -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 @@ nr_read_data_lines (struct nr_aux_data *nr,
        if (mx->fmt != FREE
             && !force_eol (mx->reader, content_names[content]))
          return 0;
-       debug_printf (("\n"));
       }
 
       if (mx->section == LOWER)
@@ -1419,11 +1416,8 @@ nr_output_data (struct nr_aux_data *nr, struct ccase *c,
            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 @@ wr_read_indeps (struct wr_aux_data *wr)
     }
   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 @@ wr_read_indeps (struct wr_aux_data *wr)
     if (mx->fmt != FREE
         && !force_eol (mx->reader, content_names[wr->content]))
       return 0;
-    debug_printf (("\n"));
   }
 
   return 1;

diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index 6aaada8e73b18291ad175a380f61a8647e88bcbc..217f0f8928a5a7dedaaa0896cade2edee68432ab 100644 (file)
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -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)

diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c
index d6eb8bfbc1e243d3d6e080cd3812f036b19b1a14..79a6711ea3a3534eb2157a453678825eca9875a7 100644 (file)
--- a/src/language/dictionary/formats.c
+++ b/src/language/dictionary/formats.c
@@ -31,8 +31,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 enum
   {
     FORMATS_PRINT = 001,

diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c
index 3bcf24d3adea9fd1fd38f7c211064987686d0467..fde8ba473cf075bc0d01eac6739df2a4bbdd4915 100644 (file)
--- a/src/language/dictionary/missing-values.c
+++ b/src/language/dictionary/missing-values.c
@@ -32,8 +32,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 int
 cmd_missing_values (void)
 {

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index 4800ac86944f83f894f6cf0df662551bec11669d..3e3d7651dbe83b73e244ec9f822805fb1f891900 100644 (file)
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -30,8 +30,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* Parses the NUMERIC command. */
 int
 cmd_numeric (void)

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index c1b6e1e7b847a29f447cac84ab50864666649d37..e5e3e69fffea5482016c1aa8c1cf90b151d07b0c 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -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

diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c
index bc171a296ebb8c02c65db2843a3569d77633b836..acf5f054e52359f16ca4a10d67f6348867659461 100644 (file)
--- a/src/language/dictionary/variable-label.c
+++ b/src/language/dictionary/variable-label.c
@@ -30,8 +30,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 int
 cmd_variable_labels (void)
 {

diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c
index 72ce7addc9f6ebcdf9d2a047e66c9c0c22347cb0..ec369dbcb5b3b0d04bc40d428c1ddb6f2bbcf259 100644 (file)
--- a/src/language/lexer/q2c.c
+++ b/src/language/lexer/q2c.c
@@ -41,8 +41,6 @@
 #endif
 
      
-#include <libpspp/debug-print.h>
-
 /* Max length of an input line. */
 #define MAX_LINE_LEN 1024
 

diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q
index 830ae37b1ca6259c979ef78daf5fff980ec1121d..cf2300676823c886f6db2ebd84def0039a69094e 100644 (file)
--- a/src/language/stats/correlations.q
+++ b/src/language/stats/correlations.q
@@ -29,8 +29,6 @@
 #include <data/variable.h>
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 struct cor_set
   {
     struct cor_set *next;

diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q
index d6de30528a246881a75f02356d1fdaf1697154eb..8f1e42b430e37f38b8977f1b18bc7a09260562f3 100644 (file)
--- a/src/language/stats/crosstabs.q
+++ b/src/language/stats/crosstabs.q
@@ -60,8 +60,6 @@
 
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 /* (specification)
    crosstabs (crs_):
      *^tables=custom;

diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q
index 375530bc859861a5939aea051b6b1e9ba690fa31..5de38ad5f05a4786935d42a7a31dff9c9221b35d 100644 (file)
--- a/src/language/stats/frequencies.q
+++ b/src/language/stats/frequencies.q
@@ -62,8 +62,6 @@
 
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 /* (specification)
    FREQUENCIES (frq_):
      *variables=custom;

diff --git a/src/language/stats/means.q b/src/language/stats/means.q
index 51644ac8a42a4239868332528503f94446f7b7ab..96c1d703e32f2924f74e5450510e5ac22e4cbe8d 100644 (file)
--- a/src/language/stats/means.q
+++ b/src/language/stats/means.q
@@ -35,8 +35,6 @@
 
 /* (headers) */
 
-#include <libpspp/debug-print.h>
-
 /* (specification)
    means (mns_):
      *tables=custom;

diff --git a/src/language/utilities/title.c b/src/language/utilities/title.c
index 15e5a404983a1d85fa321b825691b52b927b993c..d494e35e8e2cad2aa96cc1ebb736929c4ca421cf 100644 (file)
--- a/src/language/utilities/title.c
+++ b/src/language/utilities/title.c
@@ -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 @@ get_title (const char *cmd, char **title)
   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 @@ get_title (const char *cmd, char **title)
        *cp = toupper ((unsigned char) (*cp));
       token = '.';
     }
-  debug_printf ((_("%s after: %s\n"), cmd, *title));
   return CMD_SUCCESS;
 }
 

diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c
index fc463123d2a8be27a32029a3b44a2b942770ff31..fd5bd5ec40e2d2358541caa006090c2eae7030f5 100644 (file)
--- a/src/language/xforms/sample.c
+++ b/src/language/xforms/sample.c
@@ -34,8 +34,6 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/debug-print.h>
-
 /* The two different types of samples. */
 enum
   {

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 6e988a9d4fb1d7f54d80bb1d2300b3d3d78a8be3..40e57d61636f68c9bc650bcb13b5cab6a2167f93 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -12,7 +12,6 @@ src_libpspp_libpspp_a_SOURCES = \
        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 \

diff --git a/src/libpspp/debug-print.h b/src/libpspp/debug-print.h
deleted file mode 100644 (file)
index 061b219..0000000
--- a/src/libpspp/debug-print.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This file can be included multiple times.  It redeclares its macros
-   appropriately each time, like assert.h. */
-
-#undef debug_printf
-#undef debug_puts
-#undef debug_putc
-
-#if DEBUGGING
-
-#define debug_printf(args)                     \
-       do                                      \
-         {                                     \
-           printf args;                        \
-           fflush (stdout);                    \
-         }                                     \
-       while (0)
-       
-#define debug_puts(string)                     \
-       do                                      \
-         {                                     \
-           puts (string);                      \
-           fflush (stdout);                    \
-         }                                     \
-       while (0)
-
-#define debug_putc(char, stream)               \
-       do                                      \
-         {                                     \
-           putc (char, stream);                \
-           fflush (stdout);                    \
-         }                                     \
-       while (0)
-
-#else /* !DEBUGGING */
-
-#define debug_printf(args)                     \
-       do                                      \
-         {                                     \
-         }                                     \
-       while (0)
-
-#define debug_puts(string)                     \
-       do                                      \
-         {                                     \
-         }                                     \
-       while (0)
-
-#define debug_putc(char, stream)               \
-       do                                      \
-         {                                     \
-         }                                     \
-       while (0)
-
-#endif /* !DEBUGGING */

diff --git a/src/math/sort.c b/src/math/sort.c
index 4d64b32474412bd3fcd1682ab0f572315fa5bc99..c20b809aceddcce2f606b675c151b805e4d22ee7 100644 (file)
--- a/src/math/sort.c
+++ b/src/math/sort.c
@@ -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;

diff --git a/src/output/manager.c b/src/output/manager.c
index 8fd90a5e26bbcfa774b5534b9a6e7e96ee49c601..ff65e0845385b852e8cbe5b68b7a3421e56eac37 100644 (file)
--- a/src/output/manager.c
+++ b/src/output/manager.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "output.h"
-#include <libpspp/debug-print.h>
 
 /* Table. */
 int table_num = 1;

diff --git a/src/output/table.c b/src/output/table.c
index a9fc3743a6bec1f91e54a4b5aef377ab51286bfb..42361702b5de1164a4ccc0cceb06761bb2788054 100644 (file)
--- a/src/output/table.c
+++ b/src/output/table.c
@@ -37,8 +37,6 @@
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-
-#include <libpspp/debug-print.h>
 \f
 struct som_table_class tab_table_class;
 static char *command_name;

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 84cd2a6d562253432735c453b0aed506f36e9a10..69a7b12bc2bdb05ec983812027d855bda6851295 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -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);