X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fformats.c;h=a90f46e8b8efe6f4e4ce9f7efa9ca2b27572f450;hb=0097b71cac1297fba88b3c019836090dd0cf639c;hp=71e4d95f7c52a6207fe14e79ae80d136a650949a;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git

diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c
index 71e4d95f..a90f46e8 100644
--- a/src/language/dictionary/formats.c
+++ b/src/language/dictionary/formats.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -85,7 +84,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, '('))
 	{
@@ -94,7 +93,7 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
 	}
       if (!parse_format_specifier (lexer, &f)
           || !fmt_check_output (&f)
-          || !fmt_check_type_compat (&f, NUMERIC))
+          || !fmt_check_type_compat (&f, VAR_NUMERIC))
 	goto fail;
 
       if (!lex_match (lexer, ')'))
@@ -106,9 +105,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;