Reform string library.

[pspp-builds.git] / src / data / sys-file-reader.c

diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index b5fa621220db6e1358cfbac663cb6e2d546ab353..98e1a0621d9b5d9be3b6166ab4eb7702d1eb03a3 100644 (file)
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -134,16 +134,16 @@ corrupt_msg (int class, const char *format,...)
   va_list args;
   struct string text;
 
-  ds_create (&text, _("corrupt system file: "));
+  ds_init_cstr (&text, _("corrupt system file: "));
   va_start (args, format);
-  ds_vprintf (&text, format, args);
+  ds_put_vformat (&text, format, args);
   va_end (args);
 
   m.category = msg_class_to_category (class);
   m.severity = msg_class_to_severity (class);
   m.where.file_name = NULL;
   m.where.line_number = 0;
-  m.text = ds_c_str (&text);
+  m.text = ds_cstr (&text);
 
   msg_emit (&m);
 }
@@ -515,7 +515,7 @@ sfm_open_reader (struct file_handle *fh, struct dictionary **dict,
                           ! alignment_is_valid(params.align))
                        {
                          msg(MW, 
-                             _("Invalid variable display parameters.  Default parameters substituted."), 
+                             _("%s: Invalid variable display parameters.  Default parameters substituted."), 
                              fh_get_file_name(r->fh));
                          continue;
                        }