Continue reforming error message support. In this phase, we divide

[pspp-builds.git] / src / data / data-in.c

diff --git a/src/data/data-in.c b/src/data/data-in.c
index 1502417be5d048343e0106a9d9f445ab0626a1fe..1180b32b0ab0ea4c3d8b3a02ee608ceabccb62be 100644 (file)
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include "data-in.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <math.h>
 #include <ctype.h>
 #include <stdarg.h>
@@ -27,19 +27,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include "calendar.h"
+#include <libpspp/compiler.h>
 #include "identifier.h"
-#include "magic.h"
-#include "misc.h"
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
 #include "settings.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "variable.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-
-#include "debug-print.h"
 \f
 /* Specialized error routine. */
 
@@ -61,8 +60,9 @@ vdls_error (const struct data_in *i, const char *format, va_list args)
   else
     ds_printf (&title, _("(columns %d-%d"), i->f1, i->f2);
   ds_printf (&title, _(", field type %s) "), fmt_to_string (&i->format));
-    
-  e.class = DE;
+
+  e.category = MSG_DATA;
+  e.severity = MSG_ERROR;
   err_location (&e.where);
   e.title = ds_c_str (&title);