Fixed error running 'make distcheck'

[pspp] / src / language / data-io / placement-parser.c

diff --git a/src/language/data-io/placement-parser.c b/src/language/data-io/placement-parser.c
index 55e1b5d501360b6693de79cbdbd5b9349c380ba3..671933382a534054816dc89c66e6892ed31a2475 100644 (file)
--- a/src/language/data-io/placement-parser.c
+++ b/src/language/data-io/placement-parser.c
@@ -119,7 +119,7 @@ fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt,
   int fc, lc;
   size_t i;
 
-  if ( !parse_column_range (lexer, 1, &fc, &lc, NULL) )
+  if (!parse_column_range (lexer, 1, &fc, &lc, NULL))
     return false;
 
   /* Divide columns evenly. */
@@ -299,7 +299,7 @@ execute_placement_format (const struct fmt_spec *format,
     }
 }
 
-bool
+static bool
 parse_column__ (int value, int base, int *column)
 {
   assert (base == 0 || base == 1);
@@ -401,16 +401,17 @@ parse_record_placement (struct lexer *lexer, int *record, int *column)
     {
       if (lex_is_integer (lexer))
         {
-          if (lex_integer (lexer) <= *record)
+          long n = lex_integer (lexer);
+          if (n <= *record || n > INT_MAX)
             {
               msg (SE, _("The record number specified, %ld, is at or "
                          "before the previous record, %d.  Data "
                          "fields must be listed in order of "
                          "increasing record number."),
-                   lex_integer (lexer), *record);
+                   n, *record);
               return false;
             }
-          *record = lex_integer (lexer);
+          *record = n;
           lex_get (lexer);
         }
       else