Fully implement arbitrary delimiters on DATA LIST, extending the half

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

diff --git a/src/data-in.c b/src/data-in.c
index 0c477fa2a162edbccdb21040f4230cf62994b030..c082516d664efe45f39f6eaf31a1b439c0cdfb3b 100644 (file)
--- a/src/data-in.c
+++ b/src/data-in.c
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include "data-in.h"
-#include <assert.h>
+#include "error.h"
 #include <math.h>
 #include <ctype.h>
 #include <stdarg.h>
@@ -64,9 +64,9 @@ dls_error (const struct data_in *i, const char *format, ...)
     struct error e;
     struct string title;
 
-    ds_init (NULL, &title, 64);
+    ds_init (&title, 64);
     if (!getl_reading_script)
-      ds_concat (&title, _("data-file error: "));
+      ds_puts (&title, _("data-file error: "));
     if (i->f1 == i->f2)
       ds_printf (&title, _("(column %d"), i->f1);
     else
@@ -75,7 +75,7 @@ dls_error (const struct data_in *i, const char *format, ...)
     
     e.class = DE;
     err_location (&e.where);
-    e.title = ds_value (&title);
+    e.title = ds_c_str (&title);
     e.text = buf;
 
     err_vmsg (&e);