projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format: Cite variable names in messages reporting incompatible width.
[pspp]
/
src
/
language
/
dictionary
/
value-labels.c
diff --git
a/src/language/dictionary/value-labels.c
b/src/language/dictionary/value-labels.c
index 57124ebe9b6db6175e2015df3c80221eb4c1890c..235c57273b32ced586bbb0f6ecb8a000d3c8cf88 100644
(file)
--- a/
src/language/dictionary/value-labels.c
+++ b/
src/language/dictionary/value-labels.c
@@
-40,8
+40,8
@@
static int do_value_labels (struct lexer *,
const struct dictionary *dict, bool);
static int do_value_labels (struct lexer *,
const struct dictionary *dict, bool);
-static void erase_labels (struct variable **vars, size_t
var_cnt
);
-static int get_label (struct lexer *, struct variable **vars, size_t
var_cnt
,
+static void erase_labels (struct variable **vars, size_t
n_vars
);
+static int get_label (struct lexer *, struct variable **vars, size_t
n_vars
,
const char *dict_encoding);
\f
/* Stubs. */
const char *dict_encoding);
\f
/* Stubs. */
@@
-64,24
+64,24
@@
static int
do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
{
struct variable **vars; /* Variable list. */
do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
{
struct variable **vars; /* Variable list. */
- size_t
var_cnt
; /* Number of variables. */
+ size_t
n_vars
; /* Number of variables. */
int parse_err=0; /* true if error parsing variables */
lex_match (lexer, T_SLASH);
while (lex_token (lexer) != T_ENDCMD)
{
int parse_err=0; /* true if error parsing variables */
lex_match (lexer, T_SLASH);
while (lex_token (lexer) != T_ENDCMD)
{
- parse_err = !parse_variables (lexer, dict, &vars, &
var_cnt
,
+ parse_err = !parse_variables (lexer, dict, &vars, &
n_vars
,
PV_SAME_WIDTH);
PV_SAME_WIDTH);
- if (
var_cnt
< 1)
+ if (
n_vars
< 1)
{
free(vars);
return CMD_FAILURE;
}
if (erase)
{
free(vars);
return CMD_FAILURE;
}
if (erase)
- erase_labels (vars,
var_cnt
);
+ erase_labels (vars,
n_vars
);
while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
- if (!get_label (lexer, vars,
var_cnt
, dict_get_encoding (dict)))
+ if (!get_label (lexer, vars,
n_vars
, dict_get_encoding (dict)))
goto lossage;
if (lex_token (lexer) != T_SLASH)
goto lossage;
if (lex_token (lexer) != T_SLASH)
@@
-102,21
+102,19
@@
do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
return CMD_FAILURE;
}
return CMD_FAILURE;
}
-/* Erases all the labels for the
VAR_CNT
variables in VARS. */
+/* Erases all the labels for the
N_VARS
variables in VARS. */
static void
static void
-erase_labels (struct variable **vars, size_t
var_cnt
)
+erase_labels (struct variable **vars, size_t
n_vars
)
{
{
- size_t i;
-
/* Erase old value labels if desired. */
/* Erase old value labels if desired. */
- for (
i = 0; i < var_cnt
; i++)
+ for (
size_t i = 0; i < n_vars
; i++)
var_clear_value_labels (vars[i]);
}
var_clear_value_labels (vars[i]);
}
-/* Parse all the labels for the
VAR_CNT
variables in VARS and add
+/* Parse all the labels for the
N_VARS
variables in VARS and add
the specified labels to those variables. */
static int
the specified labels to those variables. */
static int
-get_label (struct lexer *lexer, struct variable **vars, size_t
var_cnt
,
+get_label (struct lexer *lexer, struct variable **vars, size_t
n_vars
,
const char *dict_encoding)
{
/* Parse all the labels and add them to the variables. */
const char *dict_encoding)
{
/* Parse all the labels and add them to the variables. */
@@
-131,7
+129,7
@@
get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt,
/* Set value. */
value_init (&value, width);
/* Set value. */
value_init (&value, width);
- if (!parse_value (lexer, &value,
width
))
+ if (!parse_value (lexer, &value,
vars[0]
))
{
value_destroy (&value, width);
return 0;
{
value_destroy (&value, width);
return 0;
@@
-151,11
+149,13
@@
get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt,
MAX_LABEL_LEN);
if (ds_length (&label) > trunc_len)
{
MAX_LABEL_LEN);
if (ds_length (&label) > trunc_len)
{
- msg (SW, _("Truncating value label to %d bytes."), MAX_LABEL_LEN);
+ lex_next_msg (lexer, SW, 0, 0,
+ _("Truncating value label to %d bytes."),
+ MAX_LABEL_LEN);
ds_truncate (&label, trunc_len);
}
ds_truncate (&label, trunc_len);
}
- for (i = 0; i <
var_cnt
; i++)
+ for (i = 0; i <
n_vars
; i++)
var_replace_value_label (vars[i], &value, ds_cstr (&label));
ds_destroy (&label);
var_replace_value_label (vars[i], &value, ds_cstr (&label));
ds_destroy (&label);