projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finish converting struct variable to an opaque type. In this
[pspp]
/
src
/
data
/
por-file-reader.c
diff --git
a/src/data/por-file-reader.c
b/src/data/por-file-reader.c
index b6bad0a00ae974f5e6c26a24f0c835887eb6502c..307a5393063f49ec84d7e4fafa4b20d573afbc93 100644
(file)
--- a/
src/data/por-file-reader.c
+++ b/
src/data/por-file-reader.c
@@
-36,6
+36,7
@@
#include "dictionary.h"
#include "file-handle-def.h"
#include "format.h"
#include "dictionary.h"
#include "file-handle-def.h"
#include "format.h"
+#include "missing-values.h"
#include <libpspp/hash.h>
#include <libpspp/magic.h>
#include <libpspp/misc.h>
#include <libpspp/hash.h>
#include <libpspp/magic.h>
#include <libpspp/misc.h>
@@
-663,7
+664,7
@@
read_value_label (struct pfm_reader *r, struct dictionary *dict)
{
struct variable *var = v[j];
{
struct variable *var = v[j];
- if (!va
l_labs_replace (var->val_labs,
val, label))
+ if (!va
r_add_value_label (var, &
val, label))
continue;
if (var_is_numeric (var))
continue;
if (var_is_numeric (var))
@@
-698,14
+699,14
@@
pfm_read_case (struct pfm_reader *r, struct ccase *c)
if (width == 0)
{
if (width == 0)
{
- case_data_rw (c, idx)->f = read_float (r);
+ case_data_rw
_idx
(c, idx)->f = read_float (r);
idx++;
}
else
{
char string[256];
read_string (r, string);
idx++;
}
else
{
char string[256];
read_string (r, string);
- buf_copy_str_rpad (case_data_rw (c, idx)->s, width, string);
+ buf_copy_str_rpad (case_data_rw
_idx
(c, idx)->s, width, string);
idx += DIV_RND_UP (width, MAX_SHORT_STRING);
}
}
idx += DIV_RND_UP (width, MAX_SHORT_STRING);
}
}