X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fval-labs.c;h=657bf5c735e8b2d59fc48ed7fb1868b394878da3;hb=92fb12eb06716d14c05b781f5d9dcde956d77c30;hp=3dc4254f6d1c74ad89d37a623578c8244f17b152;hpb=317e6b778833b5dcd5dd195c0b677835a8024b2a;p=pspp diff --git a/src/val-labs.c b/src/val-labs.c index 3dc4254f6d..657bf5c735 100644 --- a/src/val-labs.c +++ b/src/val-labs.c @@ -28,13 +28,16 @@ #include "str.h" #include "value-labels.h" #include "var.h" + +#include "gettext.h" +#define _(msgid) gettext (msgid) /* 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); /* 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,9 +108,9 @@ 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++) { @@ -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)