Clean up pref.h.orig and deal with the consequences.

[pspp] / src / data-in.c

diff --git a/src/data-in.c b/src/data-in.c
index 9259a274b56aac88adbafc70ee3b62d1088d925b..586e74f37353e86f5821dce769275f07ca342340 100644 (file)
--- a/src/data-in.c
+++ b/src/data-in.c
@@ -18,6 +18,7 @@
    02111-1307, USA. */
 
 #include <config.h>
+#include "data-in.h"
 #include <assert.h>
 #include <math.h>
 #include <ctype.h>
@@ -25,7 +26,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "data-in.h"
 #include "error.h"
 #include "getline.h"
 #include "julcal/julcal.h"
@@ -36,15 +36,13 @@
 #include "str.h"
 #include "var.h"
 \f
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 \f
 /* Specialized error routine. */
 
 static void dls_error (const struct data_in *, const char *format, ...)
-     __attribute__ ((format (printf, 2, 3)));
+     PRINTF_FORMAT (2, 3);
 
 static void
 dls_error (const struct data_in *i, const char *format, ...)
@@ -383,9 +381,10 @@ parse_Z (struct data_in *i)
 
     if (!warned)
       {
-       msg (MW, _("Quality of zoned decimal (Z) input format code is "
-                  "suspect.  Check your results three times, report bugs "
-                  "to author."));
+       msg (MW, 
+            _("Quality of zoned decimal (Z) input format code is "
+              "suspect.  Check your results three times. Report bugs "
+               "to %s."),PACKAGE_BUGREPORT);
        warned = 1;
       }
   }