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

diff --git a/src/data/data-in.c b/src/data/data-in.c
index 9da8db80..4e2e8fcb 100644
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -48,13 +48,13 @@ static void dls_error (const struct data_in *, const char *format, ...)
 static void
 vdls_error (const struct data_in *i, const char *format, va_list args)
 {
-  struct error e;
+  struct msg m;
   struct string text;
 
   if (i->flags & DI_IGNORE_ERROR)
     return;
 
-  ds_init (&text, 64);
+  ds_init (&text);
   if (i->f1 == i->f2)
     ds_printf (&text, _("(column %d"), i->f1);
   else
@@ -62,12 +62,12 @@ vdls_error (const struct data_in *i, const char *format, va_list args)
   ds_printf (&text, _(", field type %s) "), fmt_to_string (&i->format));
   ds_vprintf (&text, format, args);
 
-  e.category = MSG_DATA;
-  e.severity = MSG_ERROR;
-  err_location (&e.where);
-  e.text = ds_c_str (&text);
+  m.category = MSG_DATA;
+  m.severity = MSG_ERROR;
+  msg_location (&m.where);
+  m.text = ds_c_str (&text);
 
-  err_msg (&e);
+  msg_emit (&m);
 }
 
 static void
@@ -568,10 +568,12 @@ parse_RB (struct data_in *i)
   return true;
 }
 
+
 static inline bool
 parse_A (struct data_in *i)
 {
   buf_copy_rpad (i->v->s, i->format.w, i->s, i->e - i->s);
+  
   return true;
 }