X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=5ac8fb52a2ca4e11dd0b436a2c71e301e7864a80;hb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;hp=09dee607cc977d0c63e450f273e9bf630d1ca40b;hpb=65e61cc92b48297625bc71cf31b8a19e301eb6c1;p=pspp-builds.git

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 09dee607..5ac8fb52 100644
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -118,10 +118,10 @@ verify_val_labs (struct variable **vars, size_t var_cnt)
     {
       struct variable *vp = vars[i];
 
-      if (vp->type == ALPHA && vp->width > MAX_SHORT_STRING)
+      if (var_is_long_string (vp))
 	{
 	  msg (SE, _("It is not possible to assign value labels to long "
-		     "string variables such as %s."), vp->name);
+		     "string variables such as %s."), var_get_name (vp));
 	  return 0;
 	}
     }
@@ -152,7 +152,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
       size_t i;
 
       /* Set value. */
-      if (vars[0]->type == ALPHA)
+      if (var_is_alpha (vars[0]))
 	{
 	  if (lex_token (lexer) != T_STRING)
 	    {