projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* variable.h: (struct variable) Rename `reinit' member as `leave' and
[pspp]
/
src
/
data
/
casefile.c
diff --git
a/src/data/casefile.c
b/src/data/casefile.c
index cf2d4f8dc8b212f17e90efdd420e59202f85821a..8b1ac82838f55ff49d587ec1a14f7d620cad4f62 100644
(file)
--- a/
src/data/casefile.c
+++ b/
src/data/casefile.c
@@
-111,6
+111,8
@@
casefile_destroy(). This function will also destroy any
remaining casereaders. */
casefile_destroy(). This function will also destroy any
remaining casereaders. */
+/* FIXME: should we implement compression? */
+
/* In-memory cases are arranged in an array of arrays. The top
level is variable size and the size of each bottom level array
is fixed at the number of cases defined here. */
/* In-memory cases are arranged in an array of arrays. The top
level is variable size and the size of each bottom level array
is fixed at the number of cases defined here. */
@@
-733,18
+735,18
@@
io_error (struct casefile *cf, const char *format, ...)
{
if (cf->ok)
{
{
if (cf->ok)
{
- struct
error e
;
+ struct
msg m
;
va_list args;
va_list args;
- e.category = MSG_GENERAL;
- e.severity = MSG_ERROR;
- e.where.file_name = NULL;
- e.where.line_number = -1;
- e.title = NULL;
-
+ m.category = MSG_GENERAL;
+ m.severity = MSG_ERROR;
+ m.where.file_name = NULL;
+ m.where.line_number = -1;
va_start (args, format);
va_start (args, format);
-
err_vmsg (&e,
format, args);
+
m.text = xvasprintf (
format, args);
va_end (args);
va_end (args);
+
+ msg_emit (&m);
}
cf->ok = false;
}
}
cf->ok = false;
}