X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fnumeric.c;h=ae9619638c060d0259fe14d8a64a849c66e444ad;hb=8acca2de53c1852f38726f70fc6516b34732a79f;hp=b7a2331594918d76b1e6adbf0ed013ef5cc8c28b;hpb=f43378497b8400e9c22a3485c534693dc1bc9554;p=pspp-builds.git

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index b7a23315..ae961963 100644
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -128,7 +128,9 @@ cmd_string (struct dataset *ds)
       if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
 	return CMD_FAILURE;
 
-      if (!lex_force_match ('(') || !parse_format_specifier (&f))
+      if (!lex_force_match ('(')
+          || !parse_format_specifier (&f)
+          || !lex_force_match (')'))
 	goto fail;
       if (!fmt_is_string (f.type))
 	{
@@ -137,12 +139,8 @@ cmd_string (struct dataset *ds)
                      "variable."), fmt_to_string (&f, str));
 	  goto fail;
 	}
-
-      if (!lex_match (')'))
-	{
-	  msg (SE, _("`)' expected after output format."));
-	  goto fail;
-	}
+      if (!fmt_check_output (&f))
+        goto fail;
 
       width = fmt_var_width (&f);