Finish converting struct variable to an opaque type. In this

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

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index b7ad96eb7440d9eb7cb5dc244c3aa00eee4bb9dd..aa6794d39f7308eb6cfda619c1af5eb8b7daf357 100644 (file)
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -85,7 +85,7 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
          else
            {
              if (f.type != -1)
-               new_var->print = new_var->write = f;
+                var_set_both_formats (new_var, &f);
            }
        }
 
@@ -152,7 +152,7 @@ cmd_string (struct lexer *lexer, struct dataset *ds)
          if (!new_var)
            msg (SE, _("There is already a variable named %s."), v[i]);
          else
-            new_var->print = new_var->write = f;
+            var_set_both_formats (new_var, &f);
        }
 
       /* Clean up. */
@@ -185,7 +185,7 @@ cmd_leave (struct lexer *lexer, struct dataset *ds)
   if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
     return CMD_CASCADING_FAILURE;
   for (i = 0; i < nv; i++)
-    v[i]->leave = true;
+    var_set_leave (v[i], true);
   free (v);
 
   return lex_end_of_command (lexer);