#include <config.h>
#include "por-file-reader.h"
-#include "message.h"
+#include <libpspp/message.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <math.h>
#include <setjmp.h>
-#include "alloc.h"
+#include <libpspp/alloc.h>
#include <stdbool.h>
#include "case.h"
+#include <libpspp/compiler.h>
#include "dictionary.h"
#include "file-handle-def.h"
#include "format.h"
-#include "hash.h"
-#include "magic.h"
-#include "misc.h"
-#include "pool.h"
-#include "str.h"
+#include <libpspp/hash.h>
+#include <libpspp/magic.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <libpspp/str.h>
#include "value-labels.h"
#include "variable.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include "debug-print.h"
-
/* portable_to_local[PORTABLE] translates the given portable
character into the local character set. */
static const char portable_to_local[256] =
static void
error (struct pfm_reader *r, const char *msg,...)
- PRINTF_FORMAT (2, 3);
+ PRINTF_FORMAT (2, 3)
+ NO_RETURN;
/* Displays MSG as an error message and aborts reading the
portable file via longjmp(). */
error (struct pfm_reader *r, const char *msg, ...)
{
struct error e;
- const char *filename;
+ const char *file_name;
char *title;
va_list args;
- e.class = ME;
- e.where.filename = NULL;
+ e.category = MSG_GENERAL;
+ e.severity = MSG_ERROR;
+ e.where.file_name = NULL;
e.where.line_number = 0;
- filename = fh_get_filename (r->fh);
- e.title = title = pool_alloc (r->pool, strlen (filename) + 80);
+ file_name = fh_get_file_name (r->fh);
+ e.title = title = pool_alloc (r->pool, strlen (file_name) + 80);
sprintf (title, _("portable file %s corrupt at offset %ld: "),
- filename, ftell (r->file));
+ file_name, ftell (r->file));
va_start (args, msg);
err_vmsg (&e, msg, args);
if (setjmp (r->bail_out))
goto error;
r->fh = fh;
- r->file = pool_fopen (r->pool, fh_get_filename (r->fh), "rb");
+ r->file = pool_fopen (r->pool, fh_get_file_name (r->fh), "rb");
r->weight_index = -1;
r->trans = NULL;
r->var_cnt = 0;
{
msg (ME, _("An error occurred while opening \"%s\" for reading "
"as a portable file: %s."),
- fh_get_filename (r->fh), strerror (errno));
+ fh_get_file_name (r->fh), strerror (errno));
goto error;
}
for (i = 0; i < 8; i++)
if (!match (r, "SPSSPORT"[i]))
{
- msg (SE, _("%s: Not a portable file."), fh_get_filename (r->fh));
+ msg (SE, _("%s: Not a portable file."), fh_get_file_name (r->fh));
longjmp (r->bail_out, 1);
}
}