projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macro: Move nesting_countdown into macro_expander.
[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..8b945788a5b8921ee7bcf10dbdb5d69a53eb5f1e 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)
{
@@
-1161,12
+1159,13
@@
pcp_msg (struct pcp_reader *r, off_t offset,
ds_put_format (&text, _("`%s': "), fh_get_file_name (r->fh));
ds_put_vformat (&text, format, args);
ds_put_format (&text, _("`%s': "), fh_get_file_name (r->fh));
ds_put_vformat (&text, format, args);
- struct msg m = {
+ struct msg *m = xmalloc (sizeof *m);
+ *m = (struct msg) {
.category = msg_class_to_category (class),
.severity = msg_class_to_severity (class),
.category = msg_class_to_category (class),
.severity = msg_class_to_severity (class),
- .text = ds_cstr (&text),
+ .text = ds_
steal_
cstr (&text),
};
};
- msg_emit (
&
m);
+ msg_emit (m);
}
/* Displays a warning for offset OFFSET in the file. */
}
/* Displays a warning for offset OFFSET in the file. */