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;