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
/
sys-file-writer.c
diff --git
a/src/data/sys-file-writer.c
b/src/data/sys-file-writer.c
index b655f44073a353737d526a32f0b7159bea2e28c5..eb9f8e93b611a54aab26980d0f8070c91a0f9b87 100644
(file)
--- a/
src/data/sys-file-writer.c
+++ b/
src/data/sys-file-writer.c
@@
-854,8
+854,7
@@
write_mrsets (struct sfm_writer *w, const struct dictionary *dict,
if (mrset->width == 0)
counted = xasprintf ("%.0f", mrset->counted.f);
else
if (mrset->width == 0)
counted = xasprintf ("%.0f", mrset->counted.f);
else
- counted = xmemdup0 (value_str (&mrset->counted, mrset->width),
- mrset->width);
+ counted = xmemdup0 (mrset->counted.s, mrset->width);
ds_put_format (&s, "%zu %s", strlen (counted), counted);
free (counted);
}
ds_put_format (&s, "%zu %s", strlen (counted), counted);
free (counted);
}
@@
-1010,8
+1009,7
@@
write_long_string_value_labels (struct sfm_writer *w,
size_t len;
write_int (w, width);
size_t len;
write_int (w, width);
- write_bytes (w, value_str (val_lab_get_value (val_lab), width),
- width);
+ write_bytes (w, val_lab_get_value (val_lab)->s, width);
label = recode_string (var_get_encoding (var), "UTF-8",
val_lab_get_escaped_label (val_lab), -1);
label = recode_string (var_get_encoding (var), "UTF-8",
val_lab_get_escaped_label (val_lab), -1);
@@
-1080,7
+1078,7
@@
write_long_string_missing_values (struct sfm_writer *w,
const union value *value = mv_get_value (mv, j);
write_int (w, 8);
const union value *value = mv_get_value (mv, j);
write_int (w, 8);
- write_bytes (w, value
_str (value, width)
, 8);
+ write_bytes (w, value
->s
, 8);
}
}
}
}
}
}
@@
-1593,7
+1591,7
@@
write_value (struct sfm_writer *w, const union value *value, int width)
write_float (w, value->f);
else
{
write_float (w, value->f);
else
{
- write_bytes (w, value
_str (value, width)
, width);
+ write_bytes (w, value
->s
, width);
write_zeros (w, 8 - width);
}
}
write_zeros (w, 8 - width);
}
}