X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-in.c;h=9da8db8025c6a06b8b251848b422cdd1e4fb5593;hb=9c8c1170e3b3cb59f9bf8fe6b27ecba7067b8cfa;hp=aa8041d8a814b58c9dd11f94f509885a56c0585e;hpb=2322678e8fddbbf158b01b2720db2636404bba3b;p=pspp-builds.git

diff --git a/src/data/data-in.c b/src/data/data-in.c
index aa8041d8..9da8db80 100644
--- 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,20 +27,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include "calendar.h"
-#include "compiler.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"
 
 /* Specialized error routine. */
 
@@ -51,25 +49,25 @@ static void
 vdls_error (const struct data_in *i, const char *format, va_list args)
 {
   struct error e;
-  struct string title;
+  struct string text;
 
   if (i->flags & DI_IGNORE_ERROR)
     return;
 
-  ds_init (&title, 64);
+  ds_init (&text, 64);
   if (i->f1 == i->f2)
-    ds_printf (&title, _("(column %d"), i->f1);
+    ds_printf (&text, _("(column %d"), i->f1);
   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;
-  err_location (&e.where);
-  e.title = ds_c_str (&title);
+    ds_printf (&text, _("(columns %d-%d"), i->f1, i->f2);
+  ds_printf (&text, _(", field type %s) "), fmt_to_string (&i->format));
+  ds_vprintf (&text, format, args);
 
-  err_vmsg (&e, format, args);
+  e.category = MSG_DATA;
+  e.severity = MSG_ERROR;
+  err_location (&e.where);
+  e.text = ds_c_str (&text);
 
-  ds_destroy (&title);
+  err_msg (&e);
 }
 
 static void