X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=8c312ab8cee23ebec567ac3e1a8189285aa80e47;hb=bd50b397b3ed4e7e627c33e234a5d0394e2c3dc6;hp=0fdd7a2a362e550d69b90b33a8d42704c2349a90;hpb=691c25e36fd1ee722dd35419d6110e3876b99f9c;p=pspp diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index 0fdd7a2a36..8c312ab8ce 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -121,6 +121,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt) /* Parse all the labels and add them to the variables. */ do { + enum { MAX_LABEL_LEN = 255 }; int width = var_get_width (vars[0]); union value value; struct string label; @@ -142,12 +143,12 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt) return 0; } - ds_init_string (&label, lex_tokstr (lexer)); + ds_init_substring (&label, lex_tokss (lexer)); - if (ds_length (&label) > 60) + if (ds_length (&label) > MAX_LABEL_LEN) { - msg (SW, _("Truncating value label to 60 characters.")); - ds_truncate (&label, 60); + msg (SW, _("Truncating value label to %d bytes."), MAX_LABEL_LEN); + ds_truncate (&label, MAX_LABEL_LEN); } for (i = 0; i < var_cnt; i++)