X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fpor-file-reader.c;h=fa3af602dc4a7d1bb30914c739d45455fdf32b94;hb=cbdfa35f7fb46948d1ee8aee7b7438cf1a5fd44c;hp=c137a0507778d0df8085f158b20f2219148dc467;hpb=9c8c1170e3b3cb59f9bf8fe6b27ecba7067b8cfa;p=pspp-builds.git

diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c
index c137a050..fa3af602 100644
--- a/src/data/por-file-reader.c
+++ b/src/data/por-file-reader.c
@@ -85,24 +85,24 @@ error (struct pfm_reader *r, const char *msg,...)
 static void
 error (struct pfm_reader *r, const char *msg, ...)
 {
-  struct error e;
+  struct msg m;
   struct string text;
   va_list args;
 
-  ds_init (&text, 64);
-  ds_printf (&text, _("portable file %s corrupt at offset %ld: "),
-             fh_get_file_name (r->fh), ftell (r->file));
+  ds_init_empty (&text);
+  ds_put_format (&text, _("portable file %s corrupt at offset %ld: "),
+                 fh_get_file_name (r->fh), ftell (r->file));
   va_start (args, msg);
-  ds_vprintf (&text, msg, args);
+  ds_put_vformat (&text, msg, args);
   va_end (args);
 
-  e.category = MSG_GENERAL;
-  e.severity = MSG_ERROR;
-  e.where.file_name = NULL;
-  e.where.line_number = 0;
-  e.text = ds_c_str (&text);
+  m.category = MSG_GENERAL;
+  m.severity = MSG_ERROR;
+  m.where.file_name = NULL;
+  m.where.line_number = 0;
+  m.text = ds_cstr (&text);
   
-  err_msg (&e);
+  msg_emit (&m);
 
   r->ok = false;