Added new files resulting from directory restructuring.

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

diff --git a/src/val-labs.c b/src/val-labs.c
index 35158b7754954f17c6c72b28f414817b89dc2c64..657bf5c735e8b2d59fc48ed7fb1868b394878da3 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,13 +28,16 @@
 #include "str.h"
 #include "value-labels.h"
 #include "var.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
 \f
 /* Declarations. */
 
 static int do_value_labels (int);
-static int verify_val_labs (struct variable **vars, int var_cnt);
-static void erase_labels (struct variable **vars, int var_cnt);
-static int get_label (struct variable **vars, int var_cnt);
+static int verify_val_labs (struct variable **vars, size_t var_cnt);
+static void erase_labels (struct variable **vars, size_t var_cnt);
+static int get_label (struct variable **vars, size_t var_cnt);
 \f
 /* Stubs. */
 
@@ -56,7 +59,7 @@ static int
 do_value_labels (int erase)
 {
   struct variable **vars; /* Variable list. */
-  int var_cnt;            /* Number of variables. */
+  size_t var_cnt;         /* Number of variables. */
   int parse_err=0;        /* true if error parsing variables */
 
   lex_match ('/');
@@ -105,15 +108,15 @@ do_value_labels (int erase)
 /* Verifies that none of the VAR_CNT variables in VARS are long
    string variables. */
 static int
-verify_val_labs (struct variable **vars, int var_cnt)
+verify_val_labs (struct variable **vars, size_t var_cnt)
 {
-  int i;
+  size_t i;
 
   for (i = 0; i < var_cnt; i++)
     {
       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);
@@ -125,9 +128,9 @@ verify_val_labs (struct variable **vars, int var_cnt)
 
 /* Erases all the labels for the VAR_CNT variables in VARS. */
 static void
-erase_labels (struct variable **vars, int var_cnt) 
+erase_labels (struct variable **vars, size_t var_cnt) 
 {
-  int i;
+  size_t i;
 
   /* Erase old value labels if desired. */
   for (i = 0; i < var_cnt; i++)
@@ -137,14 +140,14 @@ erase_labels (struct variable **vars, int var_cnt)
 /* Parse all the labels for the VAR_CNT variables in VARS and add
    the specified labels to those variables.  */
 static int
-get_label (struct variable **vars, int var_cnt)
+get_label (struct variable **vars, size_t var_cnt)
 {
   /* Parse all the labels and add them to the variables. */
   do
     {
       union value value;
       char *label;
-      int i;
+      size_t i;
 
       /* Set value. */
       if (vars[0]->type == ALPHA)
@@ -154,7 +157,7 @@ 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
        {