Adopt use of gnulib for portability.

[pspp-builds.git] / src / vars-atr.c

diff --git a/src/vars-atr.c b/src/vars-atr.c
index a1b8276fcb2987fa064a89a8e1c60d0320a6a61c..a854033a0831e5ea8dbc2bffab22835724a798da 100644 (file)
--- a/src/vars-atr.c
+++ b/src/vars-atr.c
@@ -34,6 +34,9 @@
 #include "value-labels.h"
 #include "vfm.h"
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 #include "debug-print.h"
 
 /* Assign auxiliary data AUX to variable V, which must not
@@ -263,7 +266,7 @@ var_is_valid_name (const char *name, bool issue_error)
     {
       if (issue_error)
         msg (SE, _("Variable name %s exceeds %d-character limit."),
-             (int) LONG_NAME_LEN);
+             name, (int) LONG_NAME_LEN);
       return false;
     }
 
@@ -273,7 +276,7 @@ var_is_valid_name (const char *name, bool issue_error)
         if (issue_error)
           msg (SE, _("Character `%c' (in %s) may not appear in "
                      "a variable name."),
-               name);
+               name[i], name);
         return false;
       }
         
@@ -281,7 +284,8 @@ var_is_valid_name (const char *name, bool issue_error)
     {
       if (issue_error)
         msg (SE, _("Character `%c' (in %s), may not appear "
-                   "as the first character in a variable name."), name);
+                   "as the first character in a variable name."),
+             name[0], name);
       return false;
     }
 
@@ -346,8 +350,8 @@ var_set_short_name (struct variable *v, const char *short_name)
   assert (v != NULL);
   assert (short_name[0] == '\0' || var_is_valid_name (short_name, false));
   
-  st_trim_copy (v->short_name, short_name, sizeof v->short_name);
-  st_uppercase (v->short_name);
+  str_copy_trunc (v->short_name, sizeof v->short_name, short_name);
+  str_uppercase (v->short_name);
 }
 
 /* Clears V's short name. */