projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
value: Get rid of value_str(), value_str_rw(), value_num().
[pspp]
/
src
/
data
/
pc+-file-reader.c
diff --git
a/src/data/pc+-file-reader.c
b/src/data/pc+-file-reader.c
index d9904ef430ea289c798b7d05fc6a31fb9e0ba486..c7c9e3b7f8b062b75d3e57c0ed5be2a262e34fe5 100644
(file)
--- a/
src/data/pc+-file-reader.c
+++ b/
src/data/pc+-file-reader.c
@@
-900,8
+900,7
@@
parse_variable_records (struct pcp_reader *r, struct dictionary *dict,
if (var_is_numeric (var))
value.f = parse_float (rec->val_labs[i].value);
else
if (var_is_numeric (var))
value.f = parse_float (rec->val_labs[i].value);
else
- memcpy (value_str_rw (&value, rec->width),
- rec->val_labs[i].value, rec->width);
+ memcpy (value.s, rec->val_labs[i].value, rec->width);
utf8_label = recode_string ("UTF-8", dict_encoding,
rec->val_labs[i].label, -1);
utf8_label = recode_string ("UTF-8", dict_encoding,
rec->val_labs[i].label, -1);
@@
-967,8
+966,7
@@
pcp_file_casereader_read (struct casereader *reader, void *r_)
if (var->width == 0)
retval = read_case_number (r, &v->f);
else
if (var->width == 0)
retval = read_case_number (r, &v->f);
else
- retval = read_case_string (r, value_str_rw (v, var->width),
- var->width);
+ retval = read_case_string (r, v->s, var->width);
if (retval != 1)
{
if (retval != 1)
{