X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fnumeric.c;h=c04e8eba7a0f9f4797dbaf95276c5bae16b24c6f;hb=de786d64f39e8d8c7a3b1d86fbd88ec2d6d19fa6;hp=1a81e0e494ceb9300e468fc3520768d46212d8be;hpb=da1bf03a84fa10f04e8c5438f22b523f0480dd7d;p=pspp

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index 1a81e0e494..c04e8eba7a 100644
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011, 2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,8 +45,7 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
 
   do
     {
-      /* Format spec for variables to create.  f.type==-1 if default is to
-	 be used. */
+      /* Format spec for variables to create. */
       struct fmt_spec f;
 
       if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
@@ -59,7 +58,7 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
 	  if (!parse_format_specifier (lexer, &f))
 	    goto fail;
 
-	  if ( ! fmt_check_output (&f))
+	  if (! fmt_check_output (&f))
 	    goto fail;
 
 	  if (fmt_is_string (f.type))
@@ -72,12 +71,12 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
 
 	  if (!lex_match (lexer, T_RPAREN))
 	    {
-              lex_error_expecting (lexer, "`)'", NULL_SENTINEL);
+              lex_error_expecting (lexer, "`)'");
 	      goto fail;
 	    }
 	}
       else
-	f.type = -1;
+	f = var_default_formats (0);
 
       /* Create each variable. */
       for (i = 0; i < nv; i++)
@@ -86,10 +85,7 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
 	  if (!new_var)
 	    msg (SE, _("There is already a variable named %s."), v[i]);
 	  else
-	    {
-	      if (f.type != -1)
-                var_set_both_formats (new_var, &f);
-	    }
+            var_set_both_formats (new_var, &f);
 	}
 
       /* Clean up. */