X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fquick-cluster.c;h=8b2432ac455fec61a7fe8a56043ba035e5991c3d;hb=5581c901aba8df3b31f6406d7fff09e26a9e7fc1;hp=04d05d27bf2b2acf04556a55e85b276acc0be217;hpb=96994a54e60e9c95b8bba54c2281acf7059b1203;p=pspp

diff --git a/src/language/stats/quick-cluster.c b/src/language/stats/quick-cluster.c
index 04d05d27bf..8b2432ac45 100644
--- a/src/language/stats/quick-cluster.c
+++ b/src/language/stats/quick-cluster.c
@@ -40,7 +40,7 @@
 #include "libpspp/str.h"
 #include "math/random.h"
 #include "output/pivot-table.h"
-#include "output/text-item.h"
+#include "output/output-item.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -920,14 +920,9 @@ quick_cluster_parse (struct lexer *lexer, struct qc *qc)
 	      if (lex_match_id (lexer, "CLUSTERS"))
 		{
 		  if (lex_force_match (lexer, T_LPAREN) &&
-		      lex_force_int (lexer))
+		      lex_force_int_range (lexer, "CLUSTERS", 1, INT_MAX))
 		    {
 		      qc->ngroups = lex_integer (lexer);
-		      if (qc->ngroups <= 0)
-			{
-			  lex_error (lexer, _("The number of clusters must be positive"));
-			  return false;
-			}
 		      lex_get (lexer);
 		      if (!lex_force_match (lexer, T_RPAREN))
 			return false;
@@ -952,14 +947,9 @@ quick_cluster_parse (struct lexer *lexer, struct qc *qc)
 	      else if (lex_match_id (lexer, "MXITER"))
 		{
 		  if (lex_force_match (lexer, T_LPAREN) &&
-		      lex_force_int (lexer))
+		      lex_force_int_range (lexer, "MXITER", 1, INT_MAX))
 		    {
 		      qc->maxiter = lex_integer (lexer);
-		      if (qc->maxiter <= 0)
-			{
-			  lex_error (lexer, _("The number of iterations must be positive"));
-			  return false;
-			}
 		      lex_get (lexer);
 		      if (!lex_force_match (lexer, T_RPAREN))
 			return false;