Changed all the licence notices in all the files.

[pspp-builds.git] / src / val-labs.c

diff --git a/src/val-labs.c b/src/val-labs.c
index 1af46a2c5d81496e5bc5f5156805a395d3002883..2fa02e646e06d413b41875cd9ccc207f0fdd2ba5 100644 (file)
--- a/src/val-labs.c
+++ b/src/val-labs.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include <stdio.h>
@@ -79,12 +79,15 @@ do_value_labels (int erase)
           goto lossage;
 
       if (token != '/')
+       {
+       free (vars);
        break;
+       }
+
       lex_get ();
 
       free (vars);
     }
-  free (vars);
 
   if (token != '.')
     {
@@ -110,7 +113,7 @@ verify_val_labs (struct variable **vars, int var_cnt)
     {
       struct variable *vp = vars[i];
 
-      if (vp->type == ALPHA && vp->width > 8)
+      if (vp->type == ALPHA && vp->width > MAX_SHORT_STRING)
        {
          msg (SE, _("It is not possible to assign value labels to long "
                     "string variables such as %s."), vp->name);
@@ -155,12 +158,12 @@ get_label (struct variable **vars, int var_cnt)
        }
       else
        {
-         if (token != T_NUM)
+         if (!lex_is_number ())
            {
              lex_error (_("expecting integer"));
              return 0;
            }
-         if (!lex_integer_p ())
+         if (!lex_is_integer ())
            msg (SW, _("Value label `%g' is not integer."), tokval);
          value.f = tokval;
        }