Adopt use of gnulib for portability.

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

diff --git a/src/val-labs.c b/src/val-labs.c
index 1cc7b84c7c8fb3b07de654e950f2f0273e9da736..47d1ee65b406d67d839161c0f5ee42fa80dbd986 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>
@@ -28,6 +28,9 @@
 #include "str.h"
 #include "value-labels.h"
 #include "var.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
 \f
 /* Declarations. */
 
@@ -113,7 +116,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);
@@ -154,16 +157,16 @@ get_label (struct variable **vars, int var_cnt)
               lex_error (_("expecting string"));
              return 0;
            }
-         st_bare_pad_copy (value.s, ds_c_str (&tokstr), MAX_SHORT_STRING);
+         buf_copy_str_rpad (value.s, MAX_SHORT_STRING, ds_c_str (&tokstr));
        }
       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;
        }