value: Get rid of value_str(), value_str_rw(), value_num().

[pspp] / src / data / psql-reader.c

diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c
index d28085f1f4a5ab13307739a89876c0236b8a8c5e..c6f03250ddced18199b64af59351e0da9f5e6814 100644 (file)
--- a/src/data/psql-reader.c
+++ b/src/data/psql-reader.c
@@ -544,7 +544,7 @@ psql_open_reader (struct psql_read_info *info, struct dictionary **dict)
      &psql_casereader_class, r);
 
  error:
-  dict_destroy (*dict);
+  dict_unref (*dict);
 
   psql_casereader_destroy (NULL, r);
   return NULL;
@@ -840,8 +840,7 @@ set_value (struct psql_reader *r)
            case VARCHAROID:
            case BPCHAROID:
            case BYTEAOID:
-             memcpy (value_str_rw (val, var_width), vptr,
-                      MIN (length, var_width));
+             memcpy (val->s, vptr, MIN (length, var_width));
              break;
 
            case NUMERICOID: