First step in making struct variable opaque: the boring mechanical

[pspp-builds.git] / src / language / dictionary / formats.c

diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c
index 71e4d95f7c52a6207fe14e79ae80d136a650949a..34599e6b22463195d1e661611b5f9e6d3a9cf141 100644 (file)
--- a/src/language/dictionary/formats.c
+++ b/src/language/dictionary/formats.c
@@ -85,7 +85,7 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
 
       if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_NUMERIC))
        return CMD_FAILURE;
-      type = v[0]->type;
+      type = var_get_type (v[0]);
 
       if (!lex_match (lexer, '('))
        {
@@ -106,9 +106,9 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
       for (i = 0; i < cv; i++)
        {
          if (which & FORMATS_PRINT)
-           v[i]->print = f;
+            var_set_print_format (v[i], &f);
          if (which & FORMATS_WRITE)
-           v[i]->write = f;
+            var_set_write_format (v[i], &f);
        }
       free (v);
       v = NULL;