Added a --enable-debug option to configure and

moved (un)def of DEBUGGING from src files to config.h

diff --git a/ChangeLog b/ChangeLog
index 7fedbb893ec327f59b4cfb93142dece6d0cefb83..4049faa8997f8cd6307e2e163a05e107d58fdf05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 17 12:19:40 WAST 2003 John Darrington <john@darrington.wattle.id.au>
+
+       * Added an --enable-debug flag to configure
+
 2003-12-13  gettextize  <bug-gnu-gettext@gnu.org>
 
        * Makefile.am (EXTRA_DIST): Add mkinstalldirs.

diff --git a/Smake b/Smake
index 4ca8abf9fcc4622ac4553ccbe0bbfaffa26653ae..49f499fcc88e1406f578d5a83997c813cc75100a 100644 (file)
--- a/Smake
+++ b/Smake
@@ -1,17 +1,17 @@
-Makefile: Makefile.in configure
+Makefile config.h: Makefile.in configure config.h.in install-sh
        ./configure
 
-configure:  configure.ac
+configure:  configure.ac aclocal.m4
        autoconf
 
-config.h.in:
+config.h.in: configure.ac
        autoheader
 
 aclocal.m4:
        aclocal -I m4
 
 
-Makefile.in: Makefile.am aclocal.m4 config.h.in
+install-sh Makefile.in: Makefile.am aclocal.m4 config.h.in
        automake --add-missing
 
 

diff --git a/configure.ac b/configure.ac
index 25631a4d87cac9d2a27fd473d7a5dcb8239bf23a..f5fd1e3e39198c39870da6295a7a8659c3cbe6ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,11 @@ AH_BOTTOM([#include <pref.h>])
 dnl This is needed otherwise --with-included-gettext fails
 AH_BOTTOM([#include <locale.h>])
 
+AC_ARG_ENABLE(debug, [  --enable-debug          Turn on diagnostic features in the program])
+if test x"$enable_debug" = x"yes"  ; then
+  AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
+fi
+
 AC_CONFIG_FILES([Makefile po/Makefile.in m4/Makefile intl/Makefile 
                 lib/Makefile lib/julcal/Makefile lib/misc/Makefile 
                 lib/dcdflib/Makefile doc/Makefile src/Makefile 

diff --git a/po/pspp.pot b/po/pspp.pot
index 66749e930b789fa1b87e65682feee0c04e0a0db1..db100d645aa7b42520408d410cc3ff0eb42b836e 100644 (file)
--- a/po/pspp.pot
+++ b/po/pspp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-16 07:59+0800\n"
+"POT-Creation-Date: 2003-12-17 12:54+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,57 +61,57 @@ msgstr ""
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/aggregate.c:191
+#: src/aggregate.c:189
 msgid "OUTFILE specified multiple times."
 msgstr ""
 
-#: src/aggregate.c:217
+#: src/aggregate.c:215
 msgid "while expecting COLUMNWISE"
 msgstr ""
 
-#: src/aggregate.c:232
+#: src/aggregate.c:230
 msgid "BREAK specified multiple times."
 msgstr ""
 
-#: src/aggregate.c:261
+#: src/aggregate.c:259
 msgid "BREAK subcommand not specified."
 msgstr ""
 
-#: src/aggregate.c:504
+#: src/aggregate.c:502
 msgid "expecting aggregation function"
 msgstr ""
 
-#: src/aggregate.c:520
+#: src/aggregate.c:518
 #, c-format
 msgid "Unknown aggregation function %s."
 msgstr ""
 
-#: src/aggregate.c:535
+#: src/aggregate.c:533
 msgid "expecting `('"
 msgstr ""
 
-#: src/aggregate.c:570
+#: src/aggregate.c:568
 #, c-format
 msgid "Missing argument %d to %s."
 msgstr ""
 
-#: src/aggregate.c:578
+#: src/aggregate.c:576
 #, c-format
 msgid "Arguments to %s must be of same type as source variables."
 msgstr ""
 
-#: src/aggregate.c:588 src/expr-prs.c:664
+#: src/aggregate.c:586 src/expr-prs.c:664
 msgid "expecting `)'"
 msgstr ""
 
-#: src/aggregate.c:600 src/autorecode.c:114
+#: src/aggregate.c:598 src/autorecode.c:112
 #, c-format
 msgid ""
 "Number of source variables (%d) does not match number of target variables (%"
 "d)."
 msgstr ""
 
-#: src/aggregate.c:671
+#: src/aggregate.c:669
 #, c-format
 msgid ""
 "Variable name %s is not unique within the aggregate file dictionary, which "
@@ -158,95 +158,95 @@ msgstr ""
 msgid "Duplicate value for key `%s'."
 msgstr ""
 
-#: src/ascii.c:476
+#: src/ascii.c:475
 #, c-format
 msgid "Unknown configuration parameter `%s' for ascii device driver."
 msgstr ""
 
-#: src/ascii.c:489
+#: src/ascii.c:488
 #, c-format
 msgid ""
 "Unknown character set `%s'.  Valid character sets are `ascii' and `latin1'."
 msgstr ""
 
-#: src/ascii.c:498
+#: src/ascii.c:497
 #, c-format
 msgid ""
 "Unknown overstrike style `%s'.  Valid overstrike styles are `single' and "
 "`line'."
 msgstr ""
 
-#: src/ascii.c:507
+#: src/ascii.c:506
 #, c-format
 msgid ""
 "Unknown carriage return style `%s'.  Valid carriage return styles are `cr' "
 "and `bs'."
 msgstr ""
 
-#: src/ascii.c:519 src/postscript.c:696
+#: src/ascii.c:518 src/postscript.c:696
 #, c-format
 msgid "Positive integer required as value for `%s'."
 msgstr ""
 
-#: src/ascii.c:550
+#: src/ascii.c:549
 #, c-format
 msgid "Zero or positive integer required as value for `%s'."
 msgstr ""
 
-#: src/ascii.c:620 src/postscript.c:655
+#: src/ascii.c:619 src/postscript.c:655
 #, c-format
 msgid "Boolean value expected for %s."
 msgstr ""
 
-#: src/ascii.c:649 src/ascii.c:664 src/ascii.c:681
+#: src/ascii.c:648 src/ascii.c:663 src/ascii.c:680
 #, c-format
 msgid "ASCII output driver: %s: %s"
 msgstr ""
 
-#: src/ascii.c:750
+#: src/ascii.c:749
 #, c-format
 msgid "ascii_line_horz: bad hline (%d,%d),%d out of (%d,%d)\n"
 msgstr ""
 
-#: src/ascii.c:784
+#: src/ascii.c:783
 #, c-format
 msgid "ascii_line_vert: bad vline %d,(%d,%d) out of (%d,%d)\n"
 msgstr ""
 
-#: src/ascii.c:814
+#: src/ascii.c:813
 #, c-format
 msgid "ascii_line_intersection: bad intsct (%d,%d) out of (%d,%d)\n"
 msgstr ""
 
-#: src/ascii.c:976
+#: src/ascii.c:975
 #, c-format
 msgid "%s: horiz=%d, vert=%d\n"
 msgstr ""
 
-#: src/ascii.c:1148
+#: src/ascii.c:1147
 #, c-format
 msgid "Writing `%s': %s"
 msgstr ""
 
-#: src/ascii.c:1542 src/postscript.c:2120
+#: src/ascii.c:1541 src/postscript.c:2120
 #, c-format
 msgid "%s - Page %d"
 msgstr ""
 
-#: src/autorecode.c:125 src/command.c:714 src/compute.c:361
+#: src/autorecode.c:123 src/command.c:712 src/compute.c:359
 #: src/data-list.c:386 src/data-list.c:833 src/data-list.c:1636
-#: src/do-if.c:267 src/get.c:436 src/lexer.c:384 src/loop.c:250
-#: src/print.c:359 src/print.c:1100 src/recode.c:411 src/sel-if.c:56
+#: src/do-if.c:265 src/get.c:434 src/lexer.c:384 src/loop.c:248
+#: src/print.c:357 src/print.c:1098 src/recode.c:409 src/sel-if.c:56
 #: src/sel-if.c:136 src/vector.c:208
 msgid "expecting end of command"
 msgstr ""
 
-#: src/autorecode.c:135
+#: src/autorecode.c:133
 #, c-format
 msgid "Target variable %s duplicates existing variable %s."
 msgstr ""
 
-#: src/autorecode.c:142
+#: src/autorecode.c:140
 #, c-format
 msgid "Duplicate variable name %s among target variables."
 msgstr ""
@@ -323,30 +323,30 @@ msgid ""
 "Report bugs to <bug-gnu-pspp@gnu.org>.\n"
 msgstr ""
 
-#: src/command.c:161
+#: src/command.c:159
 #, c-format
 msgid "%s not allowed inside FILE TYPE/END FILE TYPE."
 msgstr ""
 
-#: src/command.c:165
+#: src/command.c:163
 #, c-format
 msgid "%s not allowed inside FILE TYPE GROUPED/END FILE TYPE."
 msgstr ""
 
-#: src/command.c:168
+#: src/command.c:166
 msgid "RECORD TYPE must be the first command inside a FILE TYPE structure."
 msgstr ""
 
-#: src/command.c:213
+#: src/command.c:211
 msgid "This line does not begin with a valid command name."
 msgstr ""
 
-#: src/command.c:223
+#: src/command.c:221
 #, c-format
 msgid "%s is not yet implemented."
 msgstr ""
 
-#: src/command.c:241
+#: src/command.c:239
 #, c-format
 msgid ""
 "%s is not allowed (1) before a command to specify the input program, such as "
@@ -354,98 +354,98 @@ msgid ""
 "PROGRAM and END INPUT PROGRAM."
 msgstr ""
 
-#: src/command.c:245
+#: src/command.c:243
 #, c-format
 msgid "%s is not allowed within an input program."
 msgstr ""
 
-#: src/command.c:246 src/command.c:247
+#: src/command.c:244 src/command.c:245
 #, c-format
 msgid "%s is only allowed within an input program."
 msgstr ""
 
-#: src/command.c:256
+#: src/command.c:254
 #, c-format
 msgid "%s command beginning\n"
 msgstr ""
 
-#: src/command.c:292
+#: src/command.c:290
 #, c-format
 msgid ""
 "%s command completed\n"
 "\n"
 msgstr ""
 
-#: src/command.c:307
+#: src/command.c:305
 msgid "The identifier(s) specified do not form a valid command name:"
 msgstr ""
 
-#: src/command.c:310
+#: src/command.c:308
 msgid "The identifier(s) specified do not form a complete command name:"
 msgstr ""
 
-#: src/command.c:434
+#: src/command.c:432
 msgid ""
 "This command is not accepted in a syntax file.  Instead, use FINISH to "
 "terminate a syntax file."
 msgstr ""
 
-#: src/command.c:452
+#: src/command.c:450
 msgid ""
 "This command is not executed in interactive mode.  Instead, PSPP drops down "
 "to the command prompt.  Use EXIT if you really want to quit."
 msgstr ""
 
-#: src/command.c:543
+#: src/command.c:541
 msgid "The sentinel may not be the empty string."
 msgstr ""
 
-#: src/command.c:601 src/command.c:732
+#: src/command.c:599 src/command.c:730
 msgid "This command not allowed when the SAFER option is set."
 msgstr ""
 
-#: src/command.c:614
+#: src/command.c:612
 #, c-format
 msgid "Error removing `%s': %s."
 msgstr ""
 
-#: src/command.c:664
+#: src/command.c:662
 #, c-format
 msgid "Couldn't fork: %s."
 msgstr ""
 
-#: src/command.c:705
+#: src/command.c:703
 #, c-format
 msgid "Error executing command: %s."
 msgstr ""
 
-#: src/command.c:755
+#: src/command.c:753
 msgid "No operating system support for this command."
 msgstr ""
 
-#: src/command.c:784
+#: src/command.c:782
 msgid "This command is not valid in a syntax file."
 msgstr ""
 
-#: src/compute.c:140 src/compute.c:186 src/compute.c:292 src/compute.c:329
+#: src/compute.c:138 src/compute.c:184 src/compute.c:290 src/compute.c:327
 #, c-format
 msgid ""
 "When executing COMPUTE: SYSMIS is not a valid value as an index into vector %"
 "s."
 msgstr ""
 
-#: src/compute.c:143 src/compute.c:189 src/compute.c:295 src/compute.c:332
+#: src/compute.c:141 src/compute.c:187 src/compute.c:293 src/compute.c:330
 #, c-format
 msgid ""
 "When executing COMPUTE: %g is not a valid value as an index into vector %s."
 msgstr ""
 
-#: src/compute.c:422
+#: src/compute.c:420
 #, c-format
 msgid "There is no vector named %s."
 msgstr ""
 
-#: src/compute.c:471
+#: src/compute.c:469
 msgid "Extra characters after expression."
 msgstr ""
 
@@ -460,182 +460,182 @@ msgid ""
 "as big as the number preceding THRU."
 msgstr ""
 
-#: src/data-in.c:71
+#: src/data-in.c:69
 msgid "data-file error: "
 msgstr ""
 
-#: src/data-in.c:73
+#: src/data-in.c:71
 #, c-format
 msgid "(column %d"
 msgstr ""
 
-#: src/data-in.c:75
+#: src/data-in.c:73
 #, c-format
 msgid "(columns %d-%d"
 msgstr ""
 
-#: src/data-in.c:76
+#: src/data-in.c:74
 #, c-format
 msgid ", field type %s) "
 msgstr ""
 
-#: src/data-in.c:225
+#: src/data-in.c:223
 msgid "Field contents followed by garbage."
 msgstr ""
 
-#: src/data-in.c:258
+#: src/data-in.c:256
 msgid "Overflow in floating-point constant."
 msgstr ""
 
-#: src/data-in.c:264
+#: src/data-in.c:262
 msgid "Underflow in floating-point constant."
 msgstr ""
 
-#: src/data-in.c:270
+#: src/data-in.c:268
 msgid "Field does not form a valid floating-point constant."
 msgstr ""
 
-#: src/data-in.c:296
+#: src/data-in.c:294
 msgid "All characters in field must be digits."
 msgstr ""
 
-#: src/data-in.c:321
+#: src/data-in.c:319
 msgid "Unrecognized character in field."
 msgstr ""
 
-#: src/data-in.c:339 src/data-in.c:588
+#: src/data-in.c:337 src/data-in.c:586
 msgid "Field must have even length."
 msgstr ""
 
-#: src/data-in.c:349 src/data-in.c:598
+#: src/data-in.c:347 src/data-in.c:596
 msgid "Field must contain only hex digits."
 msgstr ""
 
-#: src/data-in.c:386
+#: src/data-in.c:384
 msgid ""
 "Quality of zoned decimal (Z) input format code is suspect.  Check your "
 "results three times, report bugs to author."
 msgstr ""
 
-#: src/data-in.c:398
+#: src/data-in.c:396
 msgid "Zoned decimal field contains fewer than 2 characters."
 msgstr ""
 
-#: src/data-in.c:406
+#: src/data-in.c:404
 msgid "Bad sign byte in zoned decimal number."
 msgstr ""
 
-#: src/data-in.c:423
+#: src/data-in.c:421
 msgid "Format error in zoned decimal number."
 msgstr ""
 
-#: src/data-in.c:437
+#: src/data-in.c:435
 msgid "Error in syntax of zoned decimal number."
 msgstr ""
 
-#: src/data-in.c:638
+#: src/data-in.c:636
 msgid "Unexpected end of field."
 msgstr ""
 
-#: src/data-in.c:664
+#: src/data-in.c:662
 msgid "Digit expected in field."
 msgstr ""
 
-#: src/data-in.c:689
+#: src/data-in.c:687
 #, c-format
 msgid "Day (%ld) must be between 1 and 31."
 msgstr ""
 
-#: src/data-in.c:714
+#: src/data-in.c:712
 msgid "Delimiter expected between fields in date."
 msgstr ""
 
-#: src/data-in.c:811
+#: src/data-in.c:809
 #, c-format
 msgid "Month (%ld) must be between 1 and 12."
 msgstr ""
 
-#: src/data-in.c:852
+#: src/data-in.c:850
 #, c-format
 msgid "Month (%s) must be between I and XII."
 msgstr ""
 
-#: src/data-in.c:879
+#: src/data-in.c:877
 #, c-format
 msgid "Month name (%s...) is too long."
 msgstr ""
 
-#: src/data-in.c:890
+#: src/data-in.c:888
 #, c-format
 msgid "Bad month name (%s)."
 msgstr ""
 
-#: src/data-in.c:906
+#: src/data-in.c:904
 #, c-format
 msgid "Year (%ld) must be between 1582 and 19999."
 msgstr ""
 
-#: src/data-in.c:917
+#: src/data-in.c:915
 #, c-format
 msgid "Trailing garbage \"%s\" following date."
 msgstr ""
 
-#: src/data-in.c:932
+#: src/data-in.c:930
 #, c-format
 msgid "Julian day (%d) must be between 1 and 366."
 msgstr ""
 
-#: src/data-in.c:944
+#: src/data-in.c:942
 #, c-format
 msgid "Year (%d) must be between 1582 and 19999."
 msgstr ""
 
-#: src/data-in.c:960
+#: src/data-in.c:958
 #, c-format
 msgid "Quarter (%ld) must be between 1 and 4."
 msgstr ""
 
-#: src/data-in.c:970
+#: src/data-in.c:968
 msgid "`Q' expected between quarter and year."
 msgstr ""
 
-#: src/data-in.c:986
+#: src/data-in.c:984
 #, c-format
 msgid "Week (%ld) must be between 1 and 53."
 msgstr ""
 
-#: src/data-in.c:997
+#: src/data-in.c:995
 msgid "`WK' expected between week and year."
 msgstr ""
 
-#: src/data-in.c:1020
+#: src/data-in.c:1018
 msgid "Delimiter expected between fields in time."
 msgstr ""
 
-#: src/data-in.c:1032
+#: src/data-in.c:1030
 #, c-format
 msgid "Hour (%ld) must be positive."
 msgstr ""
 
-#: src/data-in.c:1044
+#: src/data-in.c:1042
 #, c-format
 msgid "Minute (%ld) must be between 0 and 59."
 msgstr ""
 
-#: src/data-in.c:1091
+#: src/data-in.c:1089
 #, c-format
 msgid "Hour (%ld) must be between 0 and 23."
 msgstr ""
 
-#: src/data-in.c:1105 src/data-in.c:1140
+#: src/data-in.c:1103 src/data-in.c:1138
 msgid "Day of the week expected in date value."
 msgstr ""
 
-#: src/data-in.c:1191
+#: src/data-in.c:1189
 msgid "Date is not in valid range between 15 Oct 1582 and 31 Dec 19999."
 msgstr ""
 
-#: src/data-in.c:1513
+#: src/data-in.c:1511
 #, c-format
 msgid "Field too long (%d characters).  Truncated after character %d."
 msgstr ""
@@ -654,7 +654,7 @@ msgstr ""
 msgid "Only one of FIXED, FREE, or LIST may be specified."
 msgstr ""
 
-#: src/data-list.c:335 src/print.c:320
+#: src/data-list.c:335 src/print.c:318
 #, c-format
 msgid ""
 "The record number specified, %ld, is before the previous record, %d.  Data "
@@ -666,13 +666,13 @@ msgid ""
 "SPSS-like or FORTRAN-like format specification expected after variable names."
 msgstr ""
 
-#: src/data-list.c:378 src/print.c:352
+#: src/data-list.c:378 src/print.c:350
 msgid ""
 "Variables are specified on records that should not exist according to "
 "RECORDS subcommand."
 msgstr ""
 
-#: src/data-list.c:410 src/data-list.c:423 src/print.c:529 src/print.c:542
+#: src/data-list.c:410 src/data-list.c:423 src/print.c:527 src/print.c:540
 msgid "Column positions for fields must be positive."
 msgstr ""
 
@@ -680,20 +680,20 @@ msgstr ""
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 
-#: src/data-list.c:452 src/print.c:570
+#: src/data-list.c:452 src/print.c:568
 msgid "A format specifier on this line has extra characters on the end."
 msgstr ""
 
-#: src/data-list.c:467 src/print.c:586
+#: src/data-list.c:467 src/print.c:584
 msgid "The value for number of decimal places must be at least 1."
 msgstr ""
 
-#: src/data-list.c:481 src/print.c:599
+#: src/data-list.c:481 src/print.c:597
 #, c-format
 msgid "Input format %s doesn't accept decimal places."
 msgstr ""
 
-#: src/data-list.c:502 src/print.c:619
+#: src/data-list.c:502 src/print.c:617
 #, c-format
 msgid "The %d columns %d-%d can't be evenly divided into %d fields."
 msgstr ""
@@ -713,32 +713,32 @@ msgstr ""
 msgid "There is already a string variable %s of a different width."
 msgstr ""
 
-#: src/data-list.c:611 src/print.c:708
+#: src/data-list.c:611 src/print.c:706
 msgid ""
 "The number of format specifications exceeds the number of variable names "
 "given."
 msgstr ""
 
-#: src/data-list.c:695 src/print.c:792
+#: src/data-list.c:695 src/print.c:790
 msgid ""
 "There aren't enough format specifications to match the number of variable "
 "names given."
 msgstr ""
 
-#: src/data-list.c:729 src/data-list.c:860 src/print.c:824
-#: src/sysfile-info.c:127 src/sysfile-info.c:366 src/vfm.c:1116
+#: src/data-list.c:729 src/data-list.c:860 src/print.c:822
+#: src/sysfile-info.c:127 src/sysfile-info.c:366 src/vfm.c:1113
 msgid "Variable"
 msgstr ""
 
-#: src/data-list.c:730 src/print.c:825
+#: src/data-list.c:730 src/print.c:823
 msgid "Record"
 msgstr ""
 
-#: src/data-list.c:731 src/print.c:826
+#: src/data-list.c:731 src/print.c:824
 msgid "Columns"
 msgstr ""
 
-#: src/data-list.c:732 src/data-list.c:861 src/print.c:827
+#: src/data-list.c:732 src/data-list.c:861 src/print.c:825
 msgid "Format"
 msgstr ""
 
@@ -925,185 +925,185 @@ msgstr ""
 msgid "Unexpected end of file with %d repetitions remaining out of %d."
 msgstr ""
 
-#: src/data-out.c:145 src/sfm-read.c:510 src/sysfile-info.c:111
+#: src/data-out.c:143 src/sfm-read.c:508 src/sysfile-info.c:111
 msgid "Unknown"
 msgstr ""
 
-#: src/data-out.c:253
+#: src/data-out.c:251
 msgid ""
 "The N output format cannot be used to output a negative number or the system-"
 "missing value."
 msgstr ""
 
-#: src/data-out.c:363
+#: src/data-out.c:361
 msgid ""
 "Quality of zoned decimal (Z) output format code is suspect.  Check your "
 "results, report bugs to author."
 msgstr ""
 
-#: src/data-out.c:370
+#: src/data-out.c:368
 msgid "The system-missing value cannot be output as a zoned decimal number."
 msgstr ""
 
-#: src/data-out.c:383
+#: src/data-out.c:381
 #, c-format
 msgid "Number %g too big to fit in field with format Z%d.%d."
 msgstr ""
 
-#: src/data-out.c:775
+#: src/data-out.c:773
 #, c-format
 msgid "Time value %g too large in magnitude to convert to alphanumeric time."
 msgstr ""
 
-#: src/data-out.c:828
+#: src/data-out.c:826
 #, c-format
 msgid "Weekday index %d does not lie between 1 and 7."
 msgstr ""
 
-#: src/data-out.c:849
+#: src/data-out.c:847
 #, c-format
 msgid "Month index %d does not lie between 1 and 12."
 msgstr ""
 
-#: src/data-out.c:961
+#: src/data-out.c:959
 #, c-format
 msgid ""
 "Year %d cannot be represented in four digits for output formatting purposes."
 msgstr ""
 
-#: src/dfm.c:92
+#: src/dfm.c:90
 #, c-format
 msgid "%s: Closing data-file handle %s."
 msgstr ""
 
-#: src/dfm.c:114
+#: src/dfm.c:112
 msgid "<<Bug in dfm.c>>"
 msgstr ""
 
-#: src/dfm.c:136
+#: src/dfm.c:134
 #, c-format
 msgid "%s: Opening data-file handle %s for reading."
 msgstr ""
 
-#: src/dfm.c:153 src/dfm.c:170
+#: src/dfm.c:151 src/dfm.c:168
 msgid "BEGIN DATA expected."
 msgstr ""
 
-#: src/dfm.c:190
+#: src/dfm.c:188
 #, c-format
 msgid "An error occurred while opening \"%s\" for reading as a data file: %s."
 msgstr ""
 
-#: src/dfm.c:219
+#: src/dfm.c:217
 #, c-format
 msgid "%s: Opening data-file handle %s for writing."
 msgstr ""
 
-#: src/dfm.c:225
+#: src/dfm.c:223
 msgid "Cannot open the inline file for writing."
 msgstr ""
 
-#: src/dfm.c:240
+#: src/dfm.c:238
 #, c-format
 msgid "An error occurred while opening \"%s\" for writing as a data file: %s."
 msgstr ""
 
-#: src/dfm.c:385
+#: src/dfm.c:383
 msgid ""
 "Unexpected end-of-file while reading data in BEGIN DATA.  This probably "
 "indicates a missing or misformatted END DATA command.  END DATA must appear "
 "by itself on a single line with exactly one space between words."
 msgstr ""
 
-#: src/dfm.c:418 src/dfm.c:439
+#: src/dfm.c:416 src/dfm.c:437
 #, c-format
 msgid "Error reading file %s: %s."
 msgstr ""
 
-#: src/dfm.c:442
+#: src/dfm.c:440
 #, c-format
 msgid "%s: Partial record at end of file."
 msgstr ""
 
-#: src/dfm.c:498
+#: src/dfm.c:496
 #, c-format
 msgid "Cannot read from file %s already opened for %s."
 msgstr ""
 
-#: src/dfm.c:512
+#: src/dfm.c:510
 #, c-format
 msgid "Attempt to read beyond end-of-file on file %s."
 msgstr ""
 
-#: src/dfm.c:606
+#: src/dfm.c:604
 #, c-format
 msgid "Cannot write to file %s already opened for %s."
 msgstr ""
 
-#: src/dfm.c:630
+#: src/dfm.c:628
 #, c-format
 msgid "Error writing file %s: %s."
 msgstr ""
 
-#: src/dfm.c:673
+#: src/dfm.c:671
 msgid ""
 "This command is not valid here since the current input program does not "
 "access the inline file."
 msgstr ""
 
-#: src/dfm.c:680
+#: src/dfm.c:678
 msgid "inline file: Opening for reading."
 msgstr ""
 
-#: src/dfm.c:694
+#: src/dfm.c:692
 msgid "Skipping remaining inline data."
 msgstr ""
 
-#: src/dfm.c:706
+#: src/dfm.c:704
 msgid "reading as a data file"
 msgstr ""
 
-#: src/dfm.c:713
+#: src/dfm.c:711
 msgid "writing as a data file"
 msgstr ""
 
-#: src/do-if.c:121
+#: src/do-if.c:119
 msgid "There is no DO IF to match with this ELSE IF."
 msgstr ""
 
-#: src/do-if.c:126
+#: src/do-if.c:124
 msgid "The ELSE command must follow all ELSE IF commands in a DO IF structure."
 msgstr ""
 
-#: src/do-if.c:149
+#: src/do-if.c:147
 msgid "End of command expected."
 msgstr ""
 
-#: src/do-if.c:167
+#: src/do-if.c:165
 msgid "There is no DO IF to match with this ELSE."
 msgstr ""
 
-#: src/do-if.c:173
+#: src/do-if.c:171
 msgid ""
 "There may be at most one ELSE clause in each DO IF structure.  It must be "
 "the last clause."
 msgstr ""
 
-#: src/do-if.c:210
+#: src/do-if.c:208
 msgid "There is no DO IF to match with this END IF."
 msgstr ""
 
-#: src/do-if.c:296
+#: src/do-if.c:294
 #, c-format
 msgid "DO IF %d: true\n"
 msgstr ""
 
-#: src/do-if.c:301
+#: src/do-if.c:299
 #, c-format
 msgid "DO IF %d: false\n"
 msgstr ""
 
-#: src/do-if.c:306
+#: src/do-if.c:304
 #, c-format
 msgid "DO IF %d: missing\n"
 msgstr ""
@@ -1336,14 +1336,14 @@ msgid ""
 msgstr ""
 
 #: src/expr-prs.c:1123 src/expr-prs.c:1464 src/expr-prs.c:1481
-#: src/formats.c:105 src/print.c:719 src/sfm-read.c:1004 src/sfm-read.c:1132
-#: src/sfm-read.c:1133
+#: src/formats.c:103 src/print.c:717 src/sfm-read.c:1002 src/sfm-read.c:1130
+#: src/sfm-read.c:1131
 msgid "numeric"
 msgstr ""
 
 #: src/expr-prs.c:1123 src/expr-prs.c:1467 src/expr-prs.c:1483
-#: src/formats.c:105 src/print.c:719 src/sfm-read.c:1004 src/sfm-read.c:1132
-#: src/sfm-read.c:1133
+#: src/formats.c:103 src/print.c:717 src/sfm-read.c:1002 src/sfm-read.c:1130
+#: src/sfm-read.c:1131
 msgid "string"
 msgstr ""
 
@@ -1462,7 +1462,7 @@ msgstr ""
 msgid "YES or NO expected after ORDERED."
 msgstr ""
 
-#: src/file-type.c:245 src/file-type.c:550 src/get.c:420
+#: src/file-type.c:245 src/file-type.c:550 src/get.c:418
 msgid "while expecting a valid subcommand"
 msgstr ""
 
@@ -1551,21 +1551,21 @@ msgstr ""
 msgid "Unknown record type %g."
 msgstr ""
 
-#: src/filename.c:240
+#: src/filename.c:238
 #, c-format
 msgid "Searching for `%s'..."
 msgstr ""
 
-#: src/filename.c:248 src/filename.c:280
+#: src/filename.c:246 src/filename.c:278
 msgid "Search unsuccessful!"
 msgstr ""
 
-#: src/filename.c:273
+#: src/filename.c:271
 #, c-format
 msgid "Found `%s'."
 msgstr ""
 
-#: src/filename.c:688
+#: src/filename.c:686
 #, c-format
 msgid "Not opening pipe file `%s' because SAFER option set."
 msgstr ""
@@ -1652,41 +1652,41 @@ msgstr ""
 msgid "Data format %s is not valid."
 msgstr ""
 
-#: src/formats.c:95
+#: src/formats.c:93
 msgid "`(' expected after variable list"
 msgstr ""
 
-#: src/formats.c:104
+#: src/formats.c:102
 #, c-format
 msgid "Format %s may not be assigned to a %s variable."
 msgstr ""
 
-#: src/formats.c:125 src/numeric.c:68 src/numeric.c:142
+#: src/formats.c:123 src/numeric.c:66 src/numeric.c:140
 msgid "`)' expected after output format."
 msgstr ""
 
-#: src/formats.c:155
+#: src/formats.c:153
 msgid "Formats:\n"
 msgstr ""
 
-#: src/formats.c:156
+#: src/formats.c:154
 msgid "  Name      Print         Write\n"
 msgstr ""
 
-#: src/get.c:125
+#: src/get.c:123
 msgid "GET translation table from file to memory:\n"
 msgstr ""
 
-#: src/get.c:130 src/get.c:1475
+#: src/get.c:128 src/get.c:1471
 #, c-format
 msgid "  %8s from %3d,%3d to %3d,%3d\n"
 msgstr ""
 
-#: src/get.c:426
+#: src/get.c:424
 msgid "All variables deleted from system file dictionary."
 msgstr ""
 
-#: src/get.c:472
+#: src/get.c:470
 #, c-format
 msgid ""
 "Cannot rename %s as %s because there already exists a variable named %s.  To "
@@ -1694,82 +1694,82 @@ msgid ""
 "as \"/RENAME (A=B)(B=C)(C=A)\", or equivalently, \"/RENAME (A B C=B C A)\"."
 msgstr ""
 
-#: src/get.c:497
+#: src/get.c:495
 msgid "`=' expected after variable list."
 msgstr ""
 
-#: src/get.c:504
+#: src/get.c:502
 #, c-format
 msgid ""
 "Number of variables on left side of `=' (%d) do not match number of "
 "variables on right side (%d), in parenthesized group %d of RENAME subcommand."
 msgstr ""
 
-#: src/get.c:522
+#: src/get.c:520
 #, c-format
 msgid "Duplicate variables name %s."
 msgstr ""
 
-#: src/get.c:545
+#: src/get.c:543
 msgid ""
 "\n"
 "Variables in dictionary:\n"
 msgstr ""
 
-#: src/get.c:659
+#: src/get.c:655
 msgid "The BY subcommand may be given once at most."
 msgstr ""
 
-#: src/get.c:726
+#: src/get.c:722
 msgid "The active file may not be specified more than once."
 msgstr ""
 
-#: src/get.c:735
+#: src/get.c:731
 msgid "Cannot specify the active file since no active file has been defined."
 msgstr ""
 
-#: src/get.c:767
+#: src/get.c:763
 msgid ""
 "IN, FIRST, and LAST subcommands may not occur before the first FILE or TABLE."
 msgstr ""
 
-#: src/get.c:799
+#: src/get.c:795
 #, c-format
 msgid "Multiple %s subcommands for a single FILE or TABLE."
 msgstr ""
 
-#: src/get.c:809
+#: src/get.c:805
 #, c-format
 msgid "Duplicate variable name %s while creating %s variable."
 msgstr ""
 
-#: src/get.c:823
+#: src/get.c:819
 msgid ""
 "RENAME, KEEP, and DROP subcommands may not occur before the first FILE or "
 "TABLE."
 msgstr ""
 
-#: src/get.c:847
+#: src/get.c:843
 msgid "The BY subcommand is required when a TABLE subcommand is given."
 msgstr ""
 
-#: src/get.c:868
+#: src/get.c:864
 #, c-format
 msgid "File %s lacks BY variable %s."
 msgstr ""
 
-#: src/get.c:1374
+#: src/get.c:1370
 #, c-format
 msgid ""
 "Variable %s in file %s (%s) has different type or width from the same "
 "variable in earlier file (%s)."
 msgstr ""
 
-#: src/get.c:1426
+#: src/get.c:1422
 msgid "expecting COMM or TAPE"
 msgstr ""
 
-#: src/get.c:1470
+#: src/get.c:1466
 msgid "IMPORT translation table from file to memory:\n"
 msgstr ""
 
@@ -1950,63 +1950,63 @@ msgstr ""
 msgid "Bad character \\%3o."
 msgstr ""
 
-#: src/groff-font.c:662
+#: src/groff-font.c:665
 #, c-format
 msgid "Groff font error: Cannot find \"%s\"."
 msgstr ""
 
-#: src/groff-font.c:727
+#: src/groff-font.c:730
 #, c-format
 msgid "%s: Opening Groff description file..."
 msgstr ""
 
-#: src/groff-font.c:743
+#: src/groff-font.c:746
 msgid "Multiple `sizes' declarations."
 msgstr ""
 
-#: src/groff-font.c:760
+#: src/groff-font.c:763
 msgid "Unexpected end of file.  Missing 0 terminator to `sizes' command?"
 msgstr ""
 
-#: src/groff-font.c:772 src/groff-font.c:779 src/groff-font.c:792
+#: src/groff-font.c:775 src/groff-font.c:782 src/groff-font.c:795
 msgid "Bad argument to `sizes'."
 msgstr ""
 
-#: src/groff-font.c:784
+#: src/groff-font.c:787
 msgid "Bad range in argument to `sizes'."
 msgstr ""
 
-#: src/groff-font.c:813
+#: src/groff-font.c:816
 msgid "Family name expected."
 msgstr ""
 
-#: src/groff-font.c:818
+#: src/groff-font.c:821
 msgid "This command already specified."
 msgstr ""
 
-#: src/groff-font.c:838
+#: src/groff-font.c:841
 #, c-format
 msgid "%s: Device characteristic already defined."
 msgstr ""
 
-#: src/groff-font.c:844
+#: src/groff-font.c:847
 #, c-format
 msgid "%s: Invalid numeric format."
 msgstr ""
 
-#: src/groff-font.c:874
+#: src/groff-font.c:877
 msgid "Missing `res', `unitwidth', and/or `sizes' line(s)."
 msgstr ""
 
-#: src/groff-font.c:900
+#: src/groff-font.c:903
 msgid "Description file read successfully."
 msgstr ""
 
-#: src/groff-font.c:932
+#: src/groff-font.c:935
 msgid "Error reading description file."
 msgstr ""
 
-#: src/groff-font.c:988
+#: src/groff-font.c:992
 msgid "<<fallback>>"
 msgstr ""
 
@@ -2076,31 +2076,31 @@ msgstr ""
 msgid "Unrecognized filename format."
 msgstr ""
 
-#: src/inpt-pgm.c:81
+#: src/inpt-pgm.c:79
 msgid "No matching INPUT PROGRAM command."
 msgstr ""
 
-#: src/inpt-pgm.c:86
+#: src/inpt-pgm.c:84
 msgid ""
 "No data-input or transformation commands specified between INPUT PROGRAM and "
 "END INPUT PROGRAM."
 msgstr ""
 
-#: src/inpt-pgm.c:302 src/inpt-pgm.c:445
+#: src/inpt-pgm.c:300 src/inpt-pgm.c:443
 msgid ""
 "This command may only be executed between INPUT PROGRAM and END INPUT "
 "PROGRAM."
 msgstr ""
 
-#: src/inpt-pgm.c:361
+#: src/inpt-pgm.c:359
 msgid "COLUMN subcommand multiply specified."
 msgstr ""
 
-#: src/inpt-pgm.c:375
+#: src/inpt-pgm.c:373
 msgid "expecting file handle name"
 msgstr ""
 
-#: src/inpt-pgm.c:418
+#: src/inpt-pgm.c:416
 msgid ""
 "REREAD: Column numbers must be positive finite numbers.  Column set to 1."
 msgstr ""
@@ -2164,11 +2164,11 @@ msgstr ""
 msgid "The rest of this command has been discarded."
 msgstr ""
 
-#: src/lexer.c:822 src/print.c:1193
+#: src/lexer.c:822 src/print.c:1191
 msgid "<ERROR>"
 msgstr ""
 
-#: src/lexer.c:948 src/repeat.c:227
+#: src/lexer.c:948 src/repeat.c:225
 msgid "Unexpected end of file."
 msgstr ""
 
@@ -2209,109 +2209,109 @@ msgid ""
 "spaces."
 msgstr ""
 
-#: src/loop.c:203
+#: src/loop.c:201
 msgid "The index variable may not be a string variable."
 msgstr ""
 
-#: src/loop.c:323
+#: src/loop.c:321
 msgid "There is no LOOP command that corresponds to this END LOOP."
 msgstr ""
 
-#: src/loop.c:524
+#: src/loop.c:522
 msgid ""
 "This command may only appear enclosed in a LOOP/END LOOP control structure."
 msgstr ""
 
-#: src/loop.c:530
+#: src/loop.c:528
 msgid "BREAK not enclosed in DO IF structure."
 msgstr ""
 
-#: src/loop.c:607
+#: src/loop.c:605
 #, c-format
 msgid "%s without %s."
 msgstr ""
 
-#: src/main.c:65
+#: src/main.c:63
 msgid "Error initializing output drivers."
 msgstr ""
 
-#: src/main.c:123
+#: src/main.c:124
 msgid "This command not executed."
 msgstr ""
 
-#: src/main.c:127
+#: src/main.c:128
 msgid ""
 "Skipping the rest of this command.  Part of this command may have been "
 "executed."
 msgstr ""
 
-#: src/main.c:132
+#: src/main.c:133
 msgid ""
 "Skipping the rest of this command.  This command was fully executed up to "
 "this point."
 msgstr ""
 
-#: src/main.c:137
+#: src/main.c:138
 msgid ""
 "Trailing garbage was encountered following this command.  The command was "
 "fully executed to this point."
 msgstr ""
 
-#: src/mis-val.c:79
+#: src/mis-val.c:77
 msgid "`)' expected after value specification."
 msgstr ""
 
-#: src/mis-val.c:113
+#: src/mis-val.c:111
 #, c-format
 msgid "`(' expected after variable name%s."
 msgstr ""
 
-#: src/mis-val.c:125
+#: src/mis-val.c:123
 msgid "Long string value specified."
 msgstr ""
 
-#: src/mis-val.c:130
+#: src/mis-val.c:128
 msgid "Short strings must be of equal width."
 msgstr ""
 
-#: src/mis-val.c:187
+#: src/mis-val.c:185
 #, c-format
 msgid "Range %g THRU %g is not valid because %g is greater than %g."
 msgstr ""
 
-#: src/mis-val.c:218
+#: src/mis-val.c:216
 msgid "Number or range expected."
 msgstr ""
 
-#: src/mis-val.c:251
+#: src/mis-val.c:249
 msgid "At most one range can exist in the missing values for any one variable."
 msgstr ""
 
-#: src/mis-val.c:257
+#: src/mis-val.c:255
 msgid "At most one individual value can be missing along with one range."
 msgstr ""
 
-#: src/mis-val.c:319
+#: src/mis-val.c:317
 msgid "String is not of proper length."
 msgstr ""
 
-#: src/mis-val.c:328 src/repeat.c:485
+#: src/mis-val.c:326 src/repeat.c:483
 msgid "String expected."
 msgstr ""
 
-#: src/mis-val.c:368
+#: src/mis-val.c:366
 msgid "Missing value:"
 msgstr ""
 
-#: src/mis-val.c:373
+#: src/mis-val.c:371
 msgid "(long string variable)"
 msgstr ""
 
-#: src/mis-val.c:378
+#: src/mis-val.c:376
 msgid "(no missing values)\n"
 msgstr ""
 
-#: src/mis-val.c:401
+#: src/mis-val.c:399
 #, c-format
 msgid "(!!!INTERNAL ERROR--%d!!!)\n"
 msgstr ""
@@ -2387,17 +2387,17 @@ msgstr ""
 msgid "Duplicate variable name `%s' after renaming."
 msgstr ""
 
-#: src/numeric.c:61
+#: src/numeric.c:59
 #, c-format
 msgid "Format type %s may not be used with a numeric variable."
 msgstr ""
 
-#: src/numeric.c:81 src/numeric.c:164 src/vector.c:167
+#: src/numeric.c:79 src/numeric.c:162 src/vector.c:167
 #, c-format
 msgid "There is already a variable named %s."
 msgstr ""
 
-#: src/numeric.c:135
+#: src/numeric.c:133
 #, c-format
 msgid "Format type %s may not be used with a string variable."
 msgstr ""
@@ -2707,86 +2707,86 @@ msgstr ""
 msgid "PostScript driver: Cannot find encoding `%s' for PostScript font `%s'."
 msgstr ""
 
-#: src/print.c:209
+#: src/print.c:207
 msgid "expecting a valid subcommand"
 msgstr ""
 
-#: src/print.c:389 src/print.c:406
+#: src/print.c:387 src/print.c:404
 #, c-format
 msgid "%g is not a valid column location."
 msgstr ""
 
-#: src/print.c:400
+#: src/print.c:398
 #, c-format
 msgid "Column location expected following `%d-'."
 msgstr ""
 
-#: src/print.c:411
+#: src/print.c:409
 #, c-format
 msgid ""
 "%d-%ld is not a valid column range.  The second column must be greater than "
 "or equal to the first."
 msgstr ""
 
-#: src/print.c:517
+#: src/print.c:515
 #, c-format
 msgid ""
 "%s is not of the same type as %s.  To specify variables of different types "
 "in the same variable list, use a FORTRAN-like format specifier."
 msgstr ""
 
-#: src/print.c:547
+#: src/print.c:545
 msgid ""
 "The ending column for a field must not be less than the starting column."
 msgstr ""
 
-#: src/print.c:630
+#: src/print.c:628
 #, c-format
 msgid "%s variables cannot be displayed with format %s."
 msgstr ""
 
-#: src/print.c:631 src/sfm-read.c:1002
+#: src/print.c:629 src/sfm-read.c:1000
 msgid "String"
 msgstr ""
 
-#: src/print.c:631 src/sfm-read.c:1002
+#: src/print.c:629 src/sfm-read.c:1000
 msgid "Numeric"
 msgstr ""
 
-#: src/print.c:717
+#: src/print.c:715
 #, c-format
 msgid "Display format %s may not be used with a %s variable."
 msgstr ""
 
-#: src/print.c:867
+#: src/print.c:865
 #, c-format
 msgid "Writing %3d records to file %s."
 msgstr ""
 
-#: src/print.c:868
+#: src/print.c:866
 #, c-format
 msgid "Writing %3d records to the listing file."
 msgstr ""
 
-#: src/print.c:1082
+#: src/print.c:1080
 msgid "A file name or handle was expected in the OUTFILE subcommand."
 msgstr ""
 
-#: src/print.c:1134
+#: src/print.c:1132
 #, c-format
 msgid ""
 "The expression on PRINT SPACE evaluated to %d.  It's not possible to PRINT "
 "SPACE a negative number of lines."
 msgstr ""
 
-#: src/recode.c:290
+#: src/recode.c:288
 #, c-format
 msgid ""
 "%d variable(s) cannot be recoded into %d variable(s).  Specify the same "
 "number of variables as input and output variables."
 msgstr ""
 
-#: src/recode.c:304
+#: src/recode.c:302
 #, c-format
 msgid ""
 "There is no string variable named %s.  (All string variables specified on "
@@ -2794,55 +2794,55 @@ msgid ""
 "variable.)"
 msgstr ""
 
-#: src/recode.c:313
+#: src/recode.c:311
 #, c-format
 msgid ""
 "Type mismatch between input and output variables.  Output variable %s is not "
 "a string variable, but all the input variables are string variables."
 msgstr ""
 
-#: src/recode.c:332
+#: src/recode.c:330
 #, c-format
 msgid "Type mismatch after INTO: %s is not a numeric variable."
 msgstr ""
 
-#: src/recode.c:362
+#: src/recode.c:360
 msgid ""
 "INTO must be used when the input values are numeric and output values are "
 "string."
 msgstr ""
 
-#: src/recode.c:370
+#: src/recode.c:368
 msgid ""
 "INTO must be used when the input values are string and output values are "
 "numeric."
 msgstr ""
 
-#: src/recode.c:507
+#: src/recode.c:505
 msgid ""
 "Inconsistent output types.  The output values must be all numeric or all "
 "string."
 msgstr ""
 
-#: src/recode.c:558
+#: src/recode.c:556
 msgid "following LO THRU"
 msgstr ""
 
-#: src/recode.c:574 src/recode.c:603
+#: src/recode.c:572 src/recode.c:601
 msgid "in source value"
 msgstr ""
 
-#: src/recode.c:616
+#: src/recode.c:614
 msgid ""
 "Keyword CONVERT may only be used with string input values and numeric output "
 "values."
 msgstr ""
 
-#: src/recode.c:872
+#: src/recode.c:870
 msgid "!!END!!"
 msgstr ""
 
-#: src/recode.c:893 src/recode.c:909
+#: src/recode.c:891 src/recode.c:907
 msgid "!!ERROR!!"
 msgstr ""
 
@@ -2858,12 +2858,12 @@ msgstr ""
 msgid "`)' expected after variable names."
 msgstr ""
 
-#: src/repeat.c:160
+#: src/repeat.c:158
 #, c-format
 msgid "Identifier %s is given twice."
 msgstr ""
 
-#: src/repeat.c:203
+#: src/repeat.c:201
 #, c-format
 msgid ""
 "There must be the same number of substitutions for each dummy variable "
@@ -2871,19 +2871,19 @@ msgid ""
 "s as well, but %d were specified."
 msgstr ""
 
-#: src/repeat.c:312
+#: src/repeat.c:310
 msgid "No commands in scope."
 msgstr ""
 
-#: src/repeat.c:512
+#: src/repeat.c:510
 msgid "No matching DO REPEAT."
 msgstr ""
 
-#: src/sample.c:72
+#: src/sample.c:70
 msgid "The sampling factor must be between 0 and 1 exclusive."
 msgstr ""
 
-#: src/sample.c:92
+#: src/sample.c:90
 #, c-format
 msgid "Cannot sample %d observations from a population of %d."
 msgstr ""
@@ -2900,117 +2900,117 @@ msgstr ""
 msgid "Only last instance of this command is in effect."
 msgstr ""
 
-#: src/sfm-read.c:190
+#: src/sfm-read.c:188
 msgid "corrupt system file: "
 msgstr ""
 
-#: src/sfm-read.c:206 src/sfm-write.c:741
+#: src/sfm-read.c:204 src/sfm-write.c:739
 #, c-format
 msgid "%s: Closing system file: %s."
 msgstr ""
 
-#: src/sfm-read.c:279
+#: src/sfm-read.c:277
 #, c-format
 msgid "Cannot read file %s as system file: already opened for %s."
 msgstr ""
 
-#: src/sfm-read.c:284
+#: src/sfm-read.c:282
 #, c-format
 msgid "%s: Opening system-file handle %s for reading."
 msgstr ""
 
-#: src/sfm-read.c:292
+#: src/sfm-read.c:290
 #, c-format
 msgid ""
 "An error occurred while opening \"%s\" for reading as a system file: %s."
 msgstr ""
 
-#: src/sfm-read.c:326
+#: src/sfm-read.c:324
 #, c-format
 msgid ""
 "%s: Weighting variable may not be a continuation of a long string variable."
 msgstr ""
 
-#: src/sfm-read.c:329
+#: src/sfm-read.c:327
 #, c-format
 msgid "%s: Weighting variable may not be a string variable."
 msgstr ""
 
-#: src/sfm-read.c:354
+#: src/sfm-read.c:352
 #, c-format
 msgid ""
 "%s: Orphaned variable index record (type 4).  Type 4 records must always "
 "immediately follow type 3 records."
 msgstr ""
 
-#: src/sfm-read.c:409
+#: src/sfm-read.c:407
 #, c-format
 msgid "%s: Unrecognized record type 7, subtype %d encountered in system file."
 msgstr ""
 
-#: src/sfm-read.c:433
+#: src/sfm-read.c:431
 #, c-format
 msgid "%s: Unrecognized record type %d."
 msgstr ""
 
-#: src/sfm-read.c:439
+#: src/sfm-read.c:437
 msgid "Read system-file dictionary successfully."
 msgstr ""
 
-#: src/sfm-read.c:449
+#: src/sfm-read.c:447
 msgid "Error reading system-file header."
 msgstr ""
 
-#: src/sfm-read.c:473
+#: src/sfm-read.c:471
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 3.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/sfm-read.c:485
+#: src/sfm-read.c:483
 #, c-format
 msgid ""
 "%s: Floating-point representation in system file is not IEEE-754.  PSPP "
 "cannot convert between floating-point formats."
 msgstr ""
 
-#: src/sfm-read.c:500
+#: src/sfm-read.c:498
 #, c-format
 msgid ""
 "%s: File-indicated endianness (%s) does not match endianness intuited from "
 "file header (%s)."
 msgstr ""
 
-#: src/sfm-read.c:502 src/sfm-read.c:503
+#: src/sfm-read.c:500 src/sfm-read.c:501
 msgid "big-endian"
 msgstr ""
 
-#: src/sfm-read.c:502 src/sfm-read.c:503
+#: src/sfm-read.c:500 src/sfm-read.c:501
 msgid "little-endian"
 msgstr ""
 
-#: src/sfm-read.c:504
+#: src/sfm-read.c:502
 msgid "unknown"
 msgstr ""
 
-#: src/sfm-read.c:508
+#: src/sfm-read.c:506
 #, c-format
 msgid "%s: File-indicated character representation code (%s) is not ASCII."
 msgstr ""
 
-#: src/sfm-read.c:510
+#: src/sfm-read.c:508
 msgid "DEC Kanji"
 msgstr ""
 
-#: src/sfm-read.c:529
+#: src/sfm-read.c:527
 #, c-format
 msgid ""
 "%s: Bad size (%d) or count (%d) field on record type 7, subtype 4.\tExpected "
 "size %d, count 8."
 msgstr ""
 
-#: src/sfm-read.c:544
+#: src/sfm-read.c:542
 #, c-format
 msgid ""
 "%s: File-indicated value is different from internal value for at least one "
@@ -3018,458 +3018,458 @@ msgid ""
 "%g; LOWEST: %g, %g."
 msgstr ""
 
-#: src/sfm-read.c:588
+#: src/sfm-read.c:586
 #, c-format
 msgid ""
 "%s: Bad magic.  Proper system files begin with the four characters `$FL2'. "
 "This file will not be read."
 msgstr ""
 
-#: src/sfm-read.c:631
+#: src/sfm-read.c:629
 #, c-format
 msgid ""
 "%s: File layout code has unexpected value %d.  Value should be 2, in big-"
 "endian or little-endian format."
 msgstr ""
 
-#: src/sfm-read.c:647
+#: src/sfm-read.c:645
 #, c-format
 msgid "%s: Number of elements per case (%d) is not between 1 and %d."
 msgstr ""
 
-#: src/sfm-read.c:654
+#: src/sfm-read.c:652
 #, c-format
 msgid ""
 "%s: Index of weighting variable (%d) is not between 0 and number of elements "
 "per case (%d)."
 msgstr ""
 
-#: src/sfm-read.c:660
+#: src/sfm-read.c:658
 #, c-format
 msgid "%s: Number of cases in file (%ld) is not between -1 and %d."
 msgstr ""
 
-#: src/sfm-read.c:665
+#: src/sfm-read.c:663
 #, c-format
 msgid "%s: Compression bias (%g) is not the usual value of 100."
 msgstr ""
 
-#: src/sfm-read.c:762
+#: src/sfm-read.c:760
 #, c-format
 msgid "%s: position %d: Bad record type (%d); the expected value was 2."
 msgstr ""
 
-#: src/sfm-read.c:771
+#: src/sfm-read.c:769
 #, c-format
 msgid ""
 "%s: position %d: String variable does not have proper number of continuation "
 "records."
 msgstr ""
 
-#: src/sfm-read.c:779
+#: src/sfm-read.c:777
 #, c-format
 msgid "%s: position %d: Superfluous long string continuation record."
 msgstr ""
 
-#: src/sfm-read.c:784
+#: src/sfm-read.c:782
 #, c-format
 msgid "%s: position %d: Bad variable type code %d."
 msgstr ""
 
-#: src/sfm-read.c:787
+#: src/sfm-read.c:785
 #, c-format
 msgid "%s: position %d: Variable label indicator field is not 0 or 1."
 msgstr ""
 
-#: src/sfm-read.c:791
+#: src/sfm-read.c:789
 #, c-format
 msgid ""
 "%s: position %d: Missing value indicator field is not -3, -2, 0, 1, 2, or 3."
 msgstr ""
 
-#: src/sfm-read.c:804
+#: src/sfm-read.c:802
 #, c-format
 msgid "%s: position %d: Variable name begins with invalid character."
 msgstr ""
 
-#: src/sfm-read.c:807
+#: src/sfm-read.c:805
 #, c-format
 msgid "%s: position %d: Variable name begins with lowercase letter %c."
 msgstr ""
 
-#: src/sfm-read.c:810
+#: src/sfm-read.c:808
 #, c-format
 msgid ""
 "%s: position %d: Variable name begins with octothorpe (`#').  Scratch "
 "variables should not appear in system files."
 msgstr ""
 
-#: src/sfm-read.c:824
+#: src/sfm-read.c:822
 #, c-format
 msgid "%s: position %d: Variable name character %d is lowercase letter %c."
 msgstr ""
 
-#: src/sfm-read.c:832
+#: src/sfm-read.c:830
 #, c-format
 msgid ""
 "%s: position %d: character `\\%03o' (%c) is not valid in a variable name."
 msgstr ""
 
-#: src/sfm-read.c:872
+#: src/sfm-read.c:870
 #, c-format
 msgid "%s: Variable %s indicates variable label of invalid length %d."
 msgstr ""
 
-#: src/sfm-read.c:888
+#: src/sfm-read.c:886
 #, c-format
 msgid "%s: Long string variable %s may not have missing values."
 msgstr ""
 
-#: src/sfm-read.c:912
+#: src/sfm-read.c:910
 #, c-format
 msgid ""
 "%s: String variable %s may not have missing values specified as a range."
 msgstr ""
 
-#: src/sfm-read.c:949
+#: src/sfm-read.c:947
 #, c-format
 msgid "%s: Long string continuation records omitted at end of dictionary."
 msgstr ""
 
-#: src/sfm-read.c:952
+#: src/sfm-read.c:950
 #, c-format
 msgid ""
 "%s: System file header indicates %d variable positions but %d were read from "
 "file."
 msgstr ""
 
-#: src/sfm-read.c:961
+#: src/sfm-read.c:959
 #, c-format
 msgid "%s: Duplicate variable name `%s' within system file."
 msgstr ""
 
-#: src/sfm-read.c:988 src/sfm-read.c:998
+#: src/sfm-read.c:986 src/sfm-read.c:996
 #, c-format
 msgid "%s: Bad format specifier byte (%d)."
 msgstr ""
 
-#: src/sfm-read.c:1001
+#: src/sfm-read.c:999
 #, c-format
 msgid "%s: %s variable %s has %s format specifier %s."
 msgstr ""
 
-#: src/sfm-read.c:1080
+#: src/sfm-read.c:1078
 #, c-format
 msgid ""
 "%s: Variable index record (type 4) does not immediately follow value label "
 "record (type 3) as it ought."
 msgstr ""
 
-#: src/sfm-read.c:1090
+#: src/sfm-read.c:1088
 #, c-format
 msgid ""
 "%s: Number of variables associated with a value label (%d) is not between 1 "
 "and the number of variables (%d)."
 msgstr ""
 
-#: src/sfm-read.c:1108
+#: src/sfm-read.c:1106
 #, c-format
 msgid ""
 "%s: Variable index associated with value label (%d) is not between 1 and the "
 "number of values (%d)."
 msgstr ""
 
-#: src/sfm-read.c:1115
+#: src/sfm-read.c:1113
 #, c-format
 msgid ""
 "%s: Variable index associated with value label (%d) refers to a continuation "
 "of a string variable, not to an actual variable."
 msgstr ""
 
-#: src/sfm-read.c:1119
+#: src/sfm-read.c:1117
 #, c-format
 msgid "%s: Value labels are not allowed on long string variables (%s)."
 msgstr ""
 
-#: src/sfm-read.c:1129
+#: src/sfm-read.c:1127
 #, c-format
 msgid ""
 "%s: Variables associated with value label are not all of identical type.  "
 "Variable %s has %s type, but variable %s has %s type."
 msgstr ""
 
-#: src/sfm-read.c:1172
+#: src/sfm-read.c:1170
 #, c-format
 msgid "%s: File contains duplicate label for value %g for variable %s."
 msgstr ""
 
-#: src/sfm-read.c:1175
+#: src/sfm-read.c:1173
 #, c-format
 msgid "%s: File contains duplicate label for value `%.*s' for variable %s."
 msgstr ""
 
-#: src/sfm-read.c:1215 src/sfm-read.c:1493
+#: src/sfm-read.c:1213 src/sfm-read.c:1490
 #, c-format
 msgid "%s: Reading system file: %s."
 msgstr ""
 
-#: src/sfm-read.c:1217 src/sfm-read.c:1398 src/sfm-read.c:1439
+#: src/sfm-read.c:1215 src/sfm-read.c:1395 src/sfm-read.c:1436
 #, c-format
 msgid "%s: Unexpected end of file."
 msgstr ""
 
-#: src/sfm-read.c:1234
+#: src/sfm-read.c:1232
 #, c-format
 msgid "%s: System file contains multiple type 6 (document) records."
 msgstr ""
 
-#: src/sfm-read.c:1240
+#: src/sfm-read.c:1238
 #, c-format
 msgid "%s: Number of document lines (%ld) must be greater than 0."
 msgstr ""
 
-#: src/sfm-read.c:1261
+#: src/sfm-read.c:1258
 msgid "dictionary:\n"
 msgstr ""
 
-#: src/sfm-read.c:1270
+#: src/sfm-read.c:1267
 msgid "num"
 msgstr ""
 
-#: src/sfm-read.c:1271
+#: src/sfm-read.c:1268
 msgid "str"
 msgstr ""
 
-#: src/sfm-read.c:1275
+#: src/sfm-read.c:1272
 msgid "left"
 msgstr ""
 
-#: src/sfm-read.c:1275
+#: src/sfm-read.c:1272
 msgid "right"
 msgstr ""
 
-#: src/sfm-read.c:1281
+#: src/sfm-read.c:1278
 msgid "none"
 msgstr ""
 
-#: src/sfm-read.c:1285
+#: src/sfm-read.c:1282
 msgid "one"
 msgstr ""
 
-#: src/sfm-read.c:1289
+#: src/sfm-read.c:1286
 msgid "two"
 msgstr ""
 
-#: src/sfm-read.c:1293
+#: src/sfm-read.c:1290
 msgid "three"
 msgstr ""
 
-#: src/sfm-read.c:1297
+#: src/sfm-read.c:1294
 msgid "range"
 msgstr ""
 
-#: src/sfm-read.c:1301
+#: src/sfm-read.c:1298
 msgid "low"
 msgstr ""
 
-#: src/sfm-read.c:1305
+#: src/sfm-read.c:1302
 msgid "high"
 msgstr ""
 
-#: src/sfm-read.c:1309
+#: src/sfm-read.c:1306
 msgid "range+1"
 msgstr ""
 
-#: src/sfm-read.c:1313
+#: src/sfm-read.c:1310
 msgid "low+1"
 msgstr ""
 
-#: src/sfm-read.c:1317
+#: src/sfm-read.c:1314
 msgid "high+1"
 msgstr ""
 
-#: src/sfm-read.c:1351
+#: src/sfm-read.c:1348
 #, c-format
 msgid "%s: Error reading file: %s."
 msgstr ""
 
-#: src/sfm-read.c:1389
+#: src/sfm-read.c:1386
 #, c-format
 msgid "%s: Compressed data is corrupted.  Data ends partway through a case."
 msgstr ""
 
-#: src/sfm-read.c:1495
+#: src/sfm-read.c:1492
 #, c-format
 msgid "%s: Partial record at end of system file."
 msgstr ""
 
-#: src/sfm-read.c:1533
+#: src/sfm-read.c:1530
 msgid "reading as a system file"
 msgstr ""
 
-#: src/sfm-write.c:114
+#: src/sfm-write.c:112
 #, c-format
 msgid "Cannot write file %s as system file: already opened for %s."
 msgstr ""
 
-#: src/sfm-write.c:119
+#: src/sfm-write.c:117
 #, c-format
 msgid "%s: Opening system-file handle %s for writing."
 msgstr ""
 
-#: src/sfm-write.c:129
+#: src/sfm-write.c:127
 #, c-format
 msgid ""
 "An error occurred while opening \"%s\" for writing as a system file: %s."
 msgstr ""
 
-#: src/sfm-write.c:182
+#: src/sfm-write.c:180
 msgid "Wrote system-file header successfully."
 msgstr ""
 
-#: src/sfm-write.c:187
+#: src/sfm-write.c:185
 msgid "Error writing system-file header."
 msgstr ""
 
-#: src/sfm-write.c:605
+#: src/sfm-write.c:603
 #, c-format
 msgid "%s: Writing system file: %s."
 msgstr ""
 
-#: src/sfm-write.c:751
+#: src/sfm-write.c:749
 msgid "writing as a system file"
 msgstr ""
 
-#: src/sort.c:131
+#: src/sort.c:129
 msgid "`A' or `D' expected inside parentheses."
 msgstr ""
 
-#: src/sort.c:137
+#: src/sort.c:135
 msgid "`)' expected."
 msgstr ""
 
-#: src/sort.c:462
+#: src/sort.c:460
 #, c-format
 msgid "%s: Cannot create temporary directory: %s."
 msgstr ""
 
-#: src/sort.c:486
+#: src/sort.c:484
 #, c-format
 msgid "%s: Error removing directory for temporary files: %s."
 msgstr ""
 
-#: src/sort.c:530
+#: src/sort.c:528
 #, c-format
 msgid ""
 "Out of memory.  Could not allocate room for minimum of %d cases of %d bytes "
 "each.  (PSPP workspace is currently restricted to a maximum of %d KB.)"
 msgstr ""
 
-#: src/sort.c:542
+#: src/sort.c:540
 #, c-format
 msgid "allocated %d cases == %d bytes\n"
 msgstr ""
 
-#: src/sort.c:580
+#: src/sort.c:578
 #, c-format
 msgid "%s: Error writing temporary file: %s."
 msgstr ""
 
-#: src/sort.c:592
+#: src/sort.c:590
 #, c-format
 msgid "SORT: Closing handle %d."
 msgstr ""
 
-#: src/sort.c:598 src/sort.c:822
+#: src/sort.c:596 src/sort.c:820
 #, c-format
 msgid "%s: Error closing temporary file: %s."
 msgstr ""
 
-#: src/sort.c:620 src/sort.c:636
+#: src/sort.c:618 src/sort.c:634
 #, c-format
 msgid "SORT: %s: Opening for writing as run %d."
 msgstr ""
 
-#: src/sort.c:642
+#: src/sort.c:640
 #, c-format
 msgid "%s: Error opening temporary file for reading: %s."
 msgstr ""
 
-#: src/sort.c:668 src/sort.c:684
+#: src/sort.c:666 src/sort.c:682
 #, c-format
 msgid "%s: Error creating temporary file: %s."
 msgstr ""
 
-#: src/sort.c:826 src/sort.c:987 src/sort.c:1037 src/sort.c:1207
-#: src/sort.c:1214
+#: src/sort.c:824 src/sort.c:985 src/sort.c:1035 src/sort.c:1205
+#: src/sort.c:1212
 #, c-format
 msgid "%s: Error removing temporary file: %s."
 msgstr ""
 
-#: src/sort.c:969
+#: src/sort.c:967
 msgid "merging runs"
 msgstr ""
 
-#: src/sort.c:977
+#: src/sort.c:975
 #, c-format
 msgid " into run %d(%d)\n"
 msgstr ""
 
-#: src/sort.c:996
+#: src/sort.c:994
 msgid "Out of memory expanding Huffman priority queue."
 msgstr ""
 
-#: src/sort.c:1048
+#: src/sort.c:1046
 #, c-format
 msgid "%s: Error creating temporary file for merge: %s."
 msgstr ""
 
-#: src/sort.c:1076 src/sort.c:1134
+#: src/sort.c:1074 src/sort.c:1132
 #, c-format
 msgid "%s: Error reading temporary file in merge: %s."
 msgstr ""
 
-#: src/sort.c:1079 src/sort.c:1138
+#: src/sort.c:1077 src/sort.c:1136
 #, c-format
 msgid "%s: Unexpected end of temporary file in merge."
 msgstr ""
 
-#: src/sort.c:1104
+#: src/sort.c:1102
 #, c-format
 msgid "%s: Error writing temporary file in merge: %s."
 msgstr ""
 
-#: src/sort.c:1154 src/sort.c:1187
+#: src/sort.c:1152 src/sort.c:1185
 #, c-format
 msgid "%s: Error closing temporary file in merge: %s."
 msgstr ""
 
-#: src/sort.c:1159
+#: src/sort.c:1157
 #, c-format
 msgid "%s: Error removing temporary file in merge: %s."
 msgstr ""
 
-#: src/sort.c:1258
+#: src/sort.c:1256
 #, c-format
 msgid "%s: Cannot open sort result file: %s."
 msgstr ""
 
-#: src/sort.c:1269
+#: src/sort.c:1267
 #, c-format
 msgid "%s: Error reading sort result file: %s."
 msgstr ""
 
-#: src/sort.c:1272
+#: src/sort.c:1270
 #, c-format
 msgid "%s: Unexpected end of sort result file: %s."
 msgstr ""
 
-#: src/sort.c:1283
+#: src/sort.c:1281
 #, c-format
 msgid "%s: Error closing sort result file: %s."
 msgstr ""
 
-#: src/sort.c:1287
+#: src/sort.c:1285
 #, c-format
 msgid "%s: Error removing sort result file: %s."
 msgstr ""
@@ -3575,7 +3575,7 @@ msgstr ""
 msgid "Documents in the active file:"
 msgstr ""
 
-#: src/sysfile-info.c:375 src/sysfile-info.c:535 src/vfm.c:1118
+#: src/sysfile-info.c:375 src/sysfile-info.c:535 src/vfm.c:1115
 msgid "Label"
 msgstr ""
 
@@ -3598,7 +3598,7 @@ msgstr ""
 msgid "Missing Values: "
 msgstr ""
 
-#: src/sysfile-info.c:534 src/vfm.c:1117
+#: src/sysfile-info.c:534 src/vfm.c:1114
 msgid "Value"
 msgstr ""
 
@@ -3626,89 +3626,89 @@ msgid ""
 "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
 msgstr ""
 
-#: src/temporary.c:65
+#: src/temporary.c:63
 msgid "This command is not valid inside DO IF or LOOP."
 msgstr ""
 
-#: src/temporary.c:72
+#: src/temporary.c:70
 msgid ""
 "This command may only appear once between procedures and procedure-like "
 "commands."
 msgstr ""
 
-#: src/title.c:57
+#: src/title.c:55
 #, c-format
 msgid "%s before: %s\n"
 msgstr ""
 
-#: src/title.c:57
+#: src/title.c:55
 msgid "<none>"
 msgstr ""
 
-#: src/title.c:69
+#: src/title.c:67
 #, c-format
 msgid "%s: `.' expected after string."
 msgstr ""
 
-#: src/title.c:84
+#: src/title.c:82
 #, c-format
 msgid "%s after: %s\n"
 msgstr ""
 
-#: src/title.c:134
+#: src/title.c:132
 #, c-format
 msgid "Document entered %s %02d:%02d:%02d by %s (%s):"
 msgstr ""
 
-#: src/val-labs.c:139
+#: src/val-labs.c:137
 #, c-format
 msgid ""
 "It is not possible to assign value labels to long string variables such as %"
 "s."
 msgstr ""
 
-#: src/val-labs.c:183
+#: src/val-labs.c:181
 msgid "String expected for value."
 msgstr ""
 
-#: src/val-labs.c:192
+#: src/val-labs.c:190
 msgid "Number expected for value."
 msgstr ""
 
-#: src/val-labs.c:196
+#: src/val-labs.c:194
 #, c-format
 msgid "Value label `%g' is not integer."
 msgstr ""
 
-#: src/val-labs.c:206
+#: src/val-labs.c:204
 msgid "Truncating value label to 60 characters."
 msgstr ""
 
-#: src/val-labs.c:239
+#: src/val-labs.c:237
 msgid "Value labels:"
 msgstr ""
 
-#: src/val-labs.c:256
+#: src/val-labs.c:254
 msgid "    (no value labels)\n"
 msgstr ""
 
-#: src/var-labs.c:55
+#: src/var-labs.c:53
 msgid "String expected for variable label."
 msgstr ""
 
-#: src/var-labs.c:61
+#: src/var-labs.c:59
 msgid "Truncating variable label to 120 characters."
 msgstr ""
 
-#: src/var-labs.c:89
+#: src/var-labs.c:87
 msgid "Variable labels:\n"
 msgstr ""
 
-#: src/var-labs.c:96
+#: src/var-labs.c:94
 msgid "(no variable label)"
 msgstr ""
 
-#: src/vars-atr.c:61
+#: src/vars-atr.c:59
 msgid "Vartree:\n"
 msgstr ""
 
@@ -3824,64 +3824,64 @@ msgid ""
 "the long form or the short form of VECTOR."
 msgstr ""
 
-#: src/vfm.c:311
+#: src/vfm.c:309
 #, c-format
 msgid ""
 "Workspace overflow predicted.  Max workspace is currently set to %d KB (%d "
 "cases at %d bytes each).  Paging active file to disk."
 msgstr ""
 
-#: src/vfm.c:378
+#: src/vfm.c:376
 msgid "<NOVAR>"
 msgstr ""
 
-#: src/vfm.c:638
+#: src/vfm.c:636
 #, c-format
 msgid ""
 "An error occurred attempting to create a temporary file for use as the "
 "active file: %s."
 msgstr ""
 
-#: src/vfm.c:656
+#: src/vfm.c:654
 #, c-format
 msgid ""
 "An error occurred while attempting to read from a temporary file created for "
 "the active file: %s."
 msgstr ""
 
-#: src/vfm.c:684
+#: src/vfm.c:682
 #, c-format
 msgid ""
 "An error occurred while attempting to write to a temporary file used as the "
 "active file: %s."
 msgstr ""
 
-#: src/vfm.c:698
+#: src/vfm.c:696
 #, c-format
 msgid ""
 "An error occurred while attempting to rewind a temporary file used as the "
 "active file: %s."
 msgstr ""
 
-#: src/vfm.c:813
+#: src/vfm.c:811
 msgid "Virtual memory exhausted.  Paging active file to disk."
 msgstr ""
 
-#: src/vfm.c:816
+#: src/vfm.c:814
 #, c-format
 msgid ""
 "Workspace limit of %d KB (%d cases at %d bytes each) overflowed.  Paging "
 "active file to disk."
 msgstr ""
 
-#: src/vfm.c:840 src/vfm.c:877
+#: src/vfm.c:838 src/vfm.c:875
 #, c-format
 msgid ""
 "An error occurred while attempting to write to a temporary file created as "
 "the active file, while paging to disk: %s."
 msgstr ""
 
-#: src/vfm.c:991
+#: src/vfm.c:988
 msgid "transform: "
 msgstr ""
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b6f4dedf3f30e816e8e60dd58666d3f8b455a65..92e0b769bdb125ff6add2713695cd204def65a06 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 17 12:53:01 WAST 2003 John Darrington <john@darrington.wattle.id.au>
+
+       * moved (un)defs of DEBUGGING to config.h
+
 Mon Dec 15 21:35:59 2003  Ben Pfaff  <blp@gnu.org>
 
        * groff-font.c: (add_kern) Fix indentation.

diff --git a/src/aggregate.c b/src/aggregate.c
index d49ebf9e520a51c86c13eee2fb73d95fb7b79c2f..d3f887dbd42a5a33caf1cc00522d599717ecee16 100644 (file)
--- a/src/aggregate.c
+++ b/src/aggregate.c
@@ -36,8 +36,6 @@
 #include "vfm.h"
 #include "vfmP.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Specifies how to make an aggregate variable. */

diff --git a/src/apply-dict.c b/src/apply-dict.c
index f46745311a7f42f727d4c8da98f540327a95b2cd..082a8bd89735aa119bdf3cc25b67f0d32b8843aa 100644 (file)
--- a/src/apply-dict.c
+++ b/src/apply-dict.c
@@ -28,8 +28,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Parses and executes APPLY DICTIONARY. */

diff --git a/src/autorecode.c b/src/autorecode.c
index 3a793494df4e4db7b1b223320a588718c35fa208..63bac2a910b3a9d9e24e903c4d356bb03b461523 100644 (file)
--- a/src/autorecode.c
+++ b/src/autorecode.c
@@ -30,8 +30,6 @@
 #include "var.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* FIXME: This module is less than ideally efficient, both in space

diff --git a/src/cases.c b/src/cases.c
index 814a87260f08c8fb0e067d916c9004b01eb15ddf..ba0921ddd10459412f8e115768642faa5ccebc4b 100644 (file)
--- a/src/cases.c
+++ b/src/cases.c
@@ -43,8 +43,6 @@ char *alloca ();
 #include "var.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Initializes V. */

diff --git a/src/command.c b/src/command.c
index 40c186efd9d35f92c262259679702188f5bef8d8..d4c130aa64bce968c62d38f373d4304b243b8178 100644 (file)
--- a/src/command.c
+++ b/src/command.c
@@ -61,8 +61,6 @@ char *alloca ();
 #include <sys/wait.h>
 #endif
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 \f
 /* Global variables. */

diff --git a/src/compute.c b/src/compute.c
index c4ed544fdaf4549e64d86f87ead2dc2eba01ef63..d07bcb6e21d0983b61b3e5e8ad30e907ff2591c7 100644 (file)
--- a/src/compute.c
+++ b/src/compute.c
@@ -32,8 +32,6 @@
 
 /* I can't think of any really good reason to disable debugging for
    this module. */
-/*#undef DEBUGGING */
-#define DEBUGGING 1
 #include "debug-print.h"
 
 /* COMPUTE and IF transformation. */

diff --git a/src/correlations.q b/src/correlations.q
index 6b708f6497fcb3863ff3d42c6fa5fcee7aa11031..e3e131fd5a9617d19562a1fac8d3242b77d15595 100644 (file)
--- a/src/correlations.q
+++ b/src/correlations.q
@@ -26,8 +26,6 @@
 #include "var.h"
 /* (headers) */
 
-#undef DEBUGGING
-#define DEBUGGING 1
 #include "debug-print.h"
 
 struct cor_set

diff --git a/src/crosstabs.q b/src/crosstabs.q
index 8ada7e4fa7fed8cd9e23fa17c6e5b16daeef2432..6af2335e4cfcc2335d51f40e9937ea7649378e2e 100644 (file)
--- a/src/crosstabs.q
+++ b/src/crosstabs.q
@@ -67,8 +67,6 @@ char *alloca ();
 #include "var.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* (specification)

diff --git a/src/data-in.c b/src/data-in.c
index 9259a274b56aac88adbafc70ee3b62d1088d925b..95da2eed33d4aae4800570894c5c8305ec271dec 100644 (file)
--- a/src/data-in.c
+++ b/src/data-in.c
@@ -36,8 +36,6 @@
 #include "str.h"
 #include "var.h"
 \f
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 \f

diff --git a/src/data-out.c b/src/data-out.c
index d54ebd1f0d43ec5fb1eafbc70606e157190ab011..14c0f94b39bd514dfe2e6cf24e66a5bdfcd1c882 100644 (file)
--- a/src/data-out.c
+++ b/src/data-out.c
@@ -35,8 +35,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* In older versions, numbers got their trailing zeros stripped.

diff --git a/src/dfm.c b/src/dfm.c
index 21b2b5acd340f695161495a69d49f8347861874f..0b231208b8a686b8eb9b8dc4f64e317efeed2f26 100644 (file)
--- a/src/dfm.c
+++ b/src/dfm.c
@@ -50,8 +50,6 @@ char *alloca ();
 #include "str.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* file_handle extension structure. */

diff --git a/src/do-if.c b/src/do-if.c
index b42e0eb81f9919958907a809612fd22e66499d1f..88022b3b4ccf257b163e058f7e19768699c9f229 100644 (file)
--- a/src/do-if.c
+++ b/src/do-if.c
@@ -28,8 +28,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 #if DEBUGGING

diff --git a/src/file-handle.q b/src/file-handle.q
index 309c409738e8f27483e71d1a872041f80928f214..84aff6c98fe772d605f77640fb1bb7eb4661ca32 100644 (file)
--- a/src/file-handle.q
+++ b/src/file-handle.q
@@ -33,8 +33,6 @@
 #include "var.h"
 /* (headers) */
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 avl_tree *files;

diff --git a/src/filename.c b/src/filename.c
index ac4815edb24570a305e72d3800caa626199187fd..5cbbc9eab2d6ec2bbb83dc586205cd69a61d16f1 100644 (file)
--- a/src/filename.c
+++ b/src/filename.c
@@ -46,8 +46,6 @@ char *alloca ();
 #include "str.h"
 #include "version.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* PORTME: Everything in this file is system dependent. */

diff --git a/src/formats.c b/src/formats.c
index 8d2918a769a2528da8d0673f4619ba09e274d256..aaf6f33fda0aeb30237fba147272ad63f9cee47e 100644 (file)
--- a/src/formats.c
+++ b/src/formats.c
@@ -28,8 +28,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 #if DEBUGGING

diff --git a/src/frequencies.q b/src/frequencies.q
index 353c2be634a193bd4d3d41427b266694a8eca743..0ad5cf9d277ad0c0b9a0434f2617564bf46a582a 100644 (file)
--- a/src/frequencies.q
+++ b/src/frequencies.q
@@ -45,8 +45,6 @@
 #include "var.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* (specification)

diff --git a/src/get.c b/src/get.c
index eb1c1c040298d3027e3b06956acdeaf413fbf392..f4428a5ead4a25d149ca843f9015f4b84f403340 100644 (file)
--- a/src/get.c
+++ b/src/get.c
@@ -35,8 +35,6 @@
 #include "vfm.h"
 #include "vfmP.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* XSAVE transformation (and related SAVE, EXPORT procedures). */
@@ -583,8 +581,6 @@ struct case_stream get_source =
 \f
 /* MATCH FILES. */
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* File types. */

diff --git a/src/inpt-pgm.c b/src/inpt-pgm.c
index a4e9a1802b5a8f9f98f7a5840df9a08d61aa52a8..2b3f7bf8cf308772eb07a91ca2ff19101dd0bb0e 100644 (file)
--- a/src/inpt-pgm.c
+++ b/src/inpt-pgm.c
@@ -34,8 +34,6 @@
 #include "var.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* A bit-vector of two-bit entries.  The array tells INPUT PROGRAM how

diff --git a/src/list.q b/src/list.q
index 45046a026d21731a6dd70f4c8ef6d668d84e4f2c..174c7ead573ad9f30900bb4b9d4851b565ec8aea 100644 (file)
--- a/src/list.q
+++ b/src/list.q
@@ -51,8 +51,6 @@ char *alloca ();
 #include "vfm.h"
 #include "format.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 #if DEBUGGING
@@ -753,20 +751,20 @@ debug_print (void)
       fputs (cmd.v_variables[i]->name, stdout);
     }
 
-  printf ("\n  /CASES=FROM %ld TO %ld BY %ld\n", first, last, step);
+  printf ("\n  /CASES=FROM %ld TO %ld BY %ld\n", cmd.first, cmd.last, cmd.step);
 
   fputs ("  /FORMAT=", stdout);
-  if (numbering == NUMBERED)
+  if (cmd.numbering == LST_NUMBERED)
     fputs ("NUMBERED", stdout);
   else
     fputs ("UNNUMBERED", stdout);
   putc (' ', stdout);
-  if (wrap == WRAP)
+  if (cmd.wrap == LST_WRAP)
     fputs ("WRAP", stdout);
   else
     fputs ("SINGLE", stdout);
   putc (' ', stdout);
-  if (weight == WEIGHT)
+  if (cmd.weight == LST_WEIGHT)
     fputs ("WEIGHT", stdout);
   else
     fputs ("NOWEIGHT", stdout);

diff --git a/src/loop.c b/src/loop.c
index b7dac89557d66109e32254edf0c8077522b6088b..1ccd1a5631f69faab42ba0452c1d17f0565e27b4 100644 (file)
--- a/src/loop.c
+++ b/src/loop.c
@@ -30,8 +30,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* *INDENT-OFF* */

diff --git a/src/main.c b/src/main.c
index e0f7f6a73b431efbe1bcc72830fcf9ba02a64f0a..3f519e5e0f6974ab477b1d01c268a111a0083660 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -28,8 +28,6 @@
 
 #include <stdlib.h>
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 static void parse_script (void) __attribute__ ((noreturn));

diff --git a/src/matrix-data.c b/src/matrix-data.c
index 5e4d5f5d70ad16d20cda547464adff255866db80..538074d0f0b568d35bcd77abf9981b1952f3920c 100644 (file)
--- a/src/matrix-data.c
+++ b/src/matrix-data.c
@@ -52,8 +52,6 @@ char *alloca ();
 #include "var.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* FIXME: /N subcommand not implemented.  It should be pretty simple,

diff --git a/src/means.q b/src/means.q
index 99432a35ef3667c30483c065feed6944b73f9f29..81fed923d1a4cdc16f47a1c43b47b5a6c31069dd 100644 (file)
--- a/src/means.q
+++ b/src/means.q
@@ -30,8 +30,6 @@
 #include "var.h"
 /* (headers) */
 
-#undef DEBUGGING
-#define DEBUGGING 1
 #include "debug-print.h"
 
 /* (specification)

diff --git a/src/mis-val.c b/src/mis-val.c
index a11833d71cb429d50fa0d444c5484de776b15d1a..23d803fcf05e884ed33286d534625eb22caf9718 100644 (file)
--- a/src/mis-val.c
+++ b/src/mis-val.c
@@ -27,8 +27,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 #if DEBUGGING
@@ -90,7 +88,7 @@ cmd_missing_values (void)
       free (v);
     }
 
-#if DEBUGGING
+#if 0 && DEBUGGING
   debug_print ();
 #endif
 
@@ -359,7 +357,7 @@ copy_missing_values (struct variable *dest, const struct variable *src)
 \f
 /* Debug output. */
 
-#if DEBUGGING
+#if 0 && DEBUGGING
 static void
 debug_print (void)
 {

diff --git a/src/numeric.c b/src/numeric.c
index f80865d1dadce9aa1ec4cf63249729a93f06d114..065b1a30294488df4d1b912c68c3398d75938914 100644 (file)
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -27,8 +27,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Parses the NUMERIC command. */

diff --git a/src/pfm-read.c b/src/pfm-read.c
index d5ddd21d40ce9a29145db3675ba5f135af7fa1a8..ef07642700168bd0fa226399b682008446cd1e8a 100644 (file)
--- a/src/pfm-read.c
+++ b/src/pfm-read.c
@@ -53,8 +53,6 @@ char *alloca ();
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* pfm's file_handle extension. */

diff --git a/src/pfm-write.c b/src/pfm-write.c
index eaa5c6033e7806bf875ed9bd46b674a92c88eacb..f4037db1e598b8addabf7f25493e5fcf0fdaa235 100644 (file)
--- a/src/pfm-write.c
+++ b/src/pfm-write.c
@@ -37,8 +37,6 @@
 #include "var.h"
 #include "version.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* pfm writer file_handle extension. */

diff --git a/src/pool.c b/src/pool.c
index e7396574b38a6fac8b34072568c9020b573094f9..0f5663d1f064c5b6813d86dd3644c2bdf687c51a 100644 (file)
--- a/src/pool.c
+++ b/src/pool.c
@@ -113,9 +113,7 @@ union align
 /*#define DISCRETE_BLOCKS 1*/
 
 /* Enable debug code if appropriate. */
-#undef DEBUGGING
 #if SELF_TEST
-#define DEBUGGING 1
 #endif
 
 /* Size of each block allocated in the pool, in bytes.

diff --git a/src/print.c b/src/print.c
index 70a41763c4a5d7b52e4d3d5fec9adc6a5f43364c..3f556707cdbb40a8619363db6f8903230de37d8b 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -49,8 +49,6 @@ char *alloca ();
 #include "tab.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Describes what to do when an output field is encountered. */
@@ -228,7 +226,7 @@ internal_cmd_print (int f)
   memcpy (trns, &prt, sizeof *trns);
   add_transformation ((struct trns_header *) trns);
 
-#if DEBUGGING
+#if 0 && DEBUGGING
   debug_print ();
 #endif
 
@@ -1170,7 +1168,7 @@ print_space_trns_free (struct trns_header * trns)
 \f
 /* Debugging code. */
 
-#if DEBUGGING
+#if 0 && DEBUGGING
 void
 debug_print (void)
 {

diff --git a/src/q2c.c b/src/q2c.c
index 87dcadb1044e4a6ef18624017e162d8a2b6932d9..953289c093d2c1a36d48e544056c5a8e13f59cc8 100644 (file)
--- a/src/q2c.c
+++ b/src/q2c.c
@@ -43,8 +43,6 @@
 #include "misc/strerror.c"
 #endif
      
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Max length of an input line. */

diff --git a/src/recode.c b/src/recode.c
index d799a38b4a70b838e9c2f32d90fbf15ba430b609..146e8a36a5b28e102558638a16b85bd18cd9cf8b 100644 (file)
--- a/src/recode.c
+++ b/src/recode.c
@@ -31,8 +31,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 \f
 /* Definitions. */
@@ -112,7 +110,7 @@ static void recode_trns_free (struct trns_header *);
 static double convert_to_double (char *, int);
 
 #if DEBUGGING
-static void debug_print (rcd_var * head);
+static void debug_print (struct rcd_var * head);
 #endif
 \f
 /* Parser. */

diff --git a/src/repeat.c b/src/repeat.c
index 8b66a7122a936e8d4eacc216f887fcd3d0793ee6..aef5e9842db1679c8ecee195e0ce9ccc85b67b4c 100644 (file)
--- a/src/repeat.c
+++ b/src/repeat.c
@@ -33,8 +33,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Describes one DO REPEAT macro. */

diff --git a/src/sample.c b/src/sample.c
index 84f2e8992f65340a5062be3afc7f7afe682dffcb..ce4d7758b15fc6701da5645f9c14733cc6c0a45a 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -28,8 +28,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* The two different types of samples. */

diff --git a/src/sfm-read.c b/src/sfm-read.c
index 99b6151b95a9ff3a5ce6203a3eb14697644d6141..fc51472020af32853156365f9fdbc35088632231 100644 (file)
--- a/src/sfm-read.c
+++ b/src/sfm-read.c
@@ -54,8 +54,6 @@ char *alloca ();
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* PORTME: This file may require substantial revision for those
@@ -1250,7 +1248,6 @@ lossage:
 }
 
 #if GLOBAL_DEBUGGING
-#define DEBUGGING 1
 #include "debug-print.h"
 /* Displays dictionary DICT on stdout. */
 void

diff --git a/src/sfm-write.c b/src/sfm-write.c
index e0aeb44441abe8bea32186d6a8b97d2ea360f52a..df5d0133bc30b11b86f2b5d1a2e3b7bce78e645d 100644 (file)
--- a/src/sfm-write.c
+++ b/src/sfm-write.c
@@ -57,8 +57,6 @@ char *alloca ();
 #include "var.h"
 #include "version.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* PORTME: This file may require substantial revision for those

diff --git a/src/som.c b/src/som.c
index b21f1f1860fe9d416365b05128b0654deb2c08eb..456e1a710df31305e10618eb09ce8ec0ab934eaa 100644 (file)
--- a/src/som.c
+++ b/src/som.c
@@ -23,8 +23,6 @@
 #include <stdlib.h>
 #include "output.h"
 #include "som.h"
-/*#undef DEBUGGING*/
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* Table. */

diff --git a/src/sort.c b/src/sort.c
index e5feef94c208d545a1679d664a63c372353a42f3..9f13a701b9ee41a43ad7fa7a566afdebcf4480a1 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -48,8 +48,6 @@
 #include <sys/stat.h>
 #endif
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Variables to sort. */

diff --git a/src/t-test.q b/src/t-test.q
index 6b65d0ec07b842ff03d33581b9d2956f950f8c8e..05797744ab669e945bec8249ab5e11984f54ef9d 100644 (file)
--- a/src/t-test.q
+++ b/src/t-test.q
@@ -45,8 +45,6 @@
 /* (declarations) */
 /* (functions) */
 
-#undef DEBUGGING
-#define DEBUGGING 1
 #include "debug-print.h"
 
 /* Command parsing information. */

diff --git a/src/tab.c b/src/tab.c
index 412bb0ac5d0d8084660ce23dc88ae4930529ea17..71f8f8ac1860b00e76e162559ab834989af28c6f 100644 (file)
--- a/src/tab.c
+++ b/src/tab.c
@@ -51,8 +51,6 @@ char *alloca ();
 #include "tab.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 \f
 extern struct som_table_class tab_table_class;
@@ -60,10 +58,12 @@ extern struct som_table_class tab_table_class;
 #if DEBUGGING
 #define DEFFIRST(NAME, LABEL) LABEL,
 #define DEFTAB(NAME, LABEL) LABEL,
+/*
 static const char *tab_names[] =
   {
 #include "tab.def"
   };
+*/
 #undef DEFFIRST
 #undef DEFTAB
 #endif

diff --git a/src/temporary.c b/src/temporary.c
index ed456da5a85dc3db0d3ab3253764bea7b4252399..15ec12098dfa39d97832bbc00cfc4baefebfb893 100644 (file)
--- a/src/temporary.c
+++ b/src/temporary.c
@@ -30,8 +30,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 int temporary;

diff --git a/src/title.c b/src/title.c
index cea04c63a966c96a46220d17b4905462eda8ad8b..2642b9c4af90ee9f38a1f344037ed0f89072784e 100644 (file)
--- a/src/title.c
+++ b/src/title.c
@@ -30,8 +30,6 @@
 #include "version.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 static int get_title (const char *cmd, char **title);

diff --git a/src/val-labs.c b/src/val-labs.c
index c36ff28b414dc074e1095aed78859b58280fd1b8..a5aa90b8a794e4c4629eaf44ec523319cc95f4c6 100644 (file)
--- a/src/val-labs.c
+++ b/src/val-labs.c
@@ -30,8 +30,6 @@
 \f
 /* Declarations. */
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* Variable list. */
@@ -116,7 +114,7 @@ do_value_labels (int erase)
       return CMD_TRAILING_GARBAGE;
     }
 
-#if DEBUGGING
+#if 0 && DEBUGGING
   debug_print ();
 #endif
   return CMD_SUCCESS;
@@ -230,7 +228,7 @@ get_label (void)
   return 1;
 }
 
-#if DEBUGGING
+#if 0 && DEBUGGING
 static void
 debug_print ()
 {

diff --git a/src/var-labs.c b/src/var-labs.c
index b573a4e8591ec28dc156a906cd815e162ed3762a..82d49d1e9741f889c6dd25b24ee7672a34d2aaf8 100644 (file)
--- a/src/var-labs.c
+++ b/src/var-labs.c
@@ -27,8 +27,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 #if DEBUGGING
@@ -74,13 +72,13 @@ cmd_variable_labels (void)
       free (v);
     }
   while (token != '.');
-#if DEBUGGING
+#if 0 && DEBUGGING
   debug_print ();
 #endif
   return CMD_SUCCESS;
 }
 
-#if DEBUGGING
+#if 0 && DEBUGGING
 static void
 debug_print (void)
 {

diff --git a/src/vars-atr.c b/src/vars-atr.c
index 3f4ea7fd574465ceb5e3b9bfc593af342f5977e3..9e7b541387f9d8ea1afd9d44fed2fef9de02cbbb 100644 (file)
--- a/src/vars-atr.c
+++ b/src/vars-atr.c
@@ -34,8 +34,6 @@
 #include "vector.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 #if DEBUGGING
@@ -43,7 +41,7 @@
 void
 dump_one_var_node (void * pnode, void *param, int level)
 {
-  variable *node = pnode;
+  struct variable *node = pnode;
   int i;
 
   for (i = 0; i < level - 1; i++)
@@ -59,7 +57,9 @@ void
 dump_var_tree (void)
 {
   printf (_("Vartree:\n"));
+/*
   avl_walk_inorder (default_dict.var_by_name, dump_one_var_node, NULL);
+*/
 }
 #endif
 

diff --git a/src/vfm.c b/src/vfm.c
index 331f287f8c4d1de47283e8da46d909ee62d83c4f..3a3bfde836cc4c475577fa05cb165df20d07b705 100644 (file)
--- a/src/vfm.c
+++ b/src/vfm.c
@@ -65,8 +65,6 @@ char *alloca ();
    (the data sink).  The data source is then deleted and the data sink
    becomes the data source for the next procedure. */
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 /* This is used to read from the active file. */
@@ -370,7 +368,7 @@ index_to_varname (int ccase_index)
 
   for (i = 0; i < default_dict.nvar; i++)
     {
-      variable *v = default_dict.var[i];
+      struct variable *v = default_dict.var[i];
       
       if (ccase_index >= v->fv && ccase_index < v->fv + v->nv)
        return default_dict.var[i]->name;
@@ -944,7 +942,6 @@ struct case_stream vfm_memory_stream =
     "memory",
   };
 \f
-#undef DEBUGGING
 #include "debug-print.h"
 
 /* Add temp_case to the lag queue. */