projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
file-handle-def.h (fh_ref): Add WARN_UNUSED_RESULT qualifier
[pspp]
/
src
/
data
/
sys-file-reader.c
diff --git
a/src/data/sys-file-reader.c
b/src/data/sys-file-reader.c
index af8f1b457678e60c5a927969e737d39cc169c4f9..155b91373cef5ac38e632e937505a17848efa90a 100644
(file)
--- a/
src/data/sys-file-reader.c
+++ b/
src/data/sys-file-reader.c
@@
-1035,7
+1035,7
@@
read_header (struct sfm_reader *r, struct any_read_info *info,
if (!read_int (r, &r->case_cnt))
return false;
if (!read_int (r, &r->case_cnt))
return false;
- if (
r->case_cnt > INT_MAX / 2)
+ if (r->case_cnt > INT_MAX / 2)
r->case_cnt = -1;
/* Identify floating-point format and obtain compression bias. */
r->case_cnt = -1;
/* Identify floating-point format and obtain compression bias. */
@@
-1424,7
+1424,7
@@
parse_variable_records (struct sfm_reader *r, struct dictionary *dict,
struct sfm_var_record *rec;
int n_warnings = 0;
struct sfm_var_record *rec;
int n_warnings = 0;
- for (rec = var_recs; rec < &var_recs[n_var_recs];
)
+ for (rec = var_recs; rec < &var_recs[n_var_recs];)
{
struct variable *var;
size_t n_values;
{
struct variable *var;
size_t n_values;
@@
-2213,7
+2213,7
@@
parse_value_labels (struct sfm_reader *r, struct dictionary *dict,
if (width == 0)
value.f = parse_float (r, label->value, 0);
else
if (width == 0)
value.f = parse_float (r, label->value, 0);
else
- memcpy (value
_str_rw (&value, width)
, label->value, width);
+ memcpy (value
.s
, label->value, width);
if (!var_add_value_label (var, &value, utf8_labels[j]))
{
if (!var_add_value_label (var, &value, utf8_labels[j]))
{
@@
-2232,8
+2232,7
@@
parse_value_labels (struct sfm_reader *r, struct dictionary *dict,
else
sys_warn (r, record->pos,
_("Duplicate value label for `%.*s' on %s."),
else
sys_warn (r, record->pos,
_("Duplicate value label for `%.*s' on %s."),
- width, value_str (&value, width),
- var_get_name (var));
+ width, value.s, var_get_name (var));
}
value_destroy (&value, width);
}
value_destroy (&value, width);
@@
-2520,8
+2519,7
@@
parse_long_string_value_labels (struct sfm_reader *r,
if (!skip)
{
if (value_length == width)
if (!skip)
{
if (value_length == width)
- memcpy (value_str_rw (&value, width),
- (const uint8_t *) record->data + ofs, width);
+ memcpy (value.s, (const uint8_t *) record->data + ofs, width);
else
{
sys_warn (r, record->pos + ofs,
else
{
sys_warn (r, record->pos + ofs,
@@
-2553,8
+2551,7
@@
parse_long_string_value_labels (struct sfm_reader *r,
if (!var_add_value_label (var, &value, label))
sys_warn (r, record->pos + ofs,
_("Duplicate value label for `%.*s' on %s."),
if (!var_add_value_label (var, &value, label))
sys_warn (r, record->pos + ofs,
_("Duplicate value label for `%.*s' on %s."),
- width, value_str (&value, width),
- var_get_name (var));
+ width, value.s, var_get_name (var));
pool_free (r->pool, label);
}
ofs += label_length;
pool_free (r->pool, label);
}
ofs += label_length;
@@
-2688,8
+2685,7
@@
sys_file_casereader_read (struct casereader *reader, void *r_)
retval = read_case_number (r, &v->f);
else
{
retval = read_case_number (r, &v->f);
else
{
- uint8_t *s = value_str_rw (v, sv->var_width);
- retval = read_case_string (r, s + sv->offset, sv->segment_width);
+ retval = read_case_string (r, v->s + sv->offset, sv->segment_width);
if (retval == 1)
{
retval = skip_whole_strings (r, ROUND_DOWN (sv->padding, 8));
if (retval == 1)
{
retval = skip_whole_strings (r, ROUND_DOWN (sv->padding, 8));