projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
language
/
dictionary
/
modify-variables.c
diff --git
a/src/language/dictionary/modify-variables.c
b/src/language/dictionary/modify-variables.c
index d9a72f3549eab1b61086b4322b06b9b44a55fe4c..64204b78ec374cd0ef3477e0157b9a3883e994bf 100644
(file)
--- a/
src/language/dictionary/modify-variables.c
+++ b/
src/language/dictionary/modify-variables.c
@@
-111,7
+111,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (already_encountered & 1)
{
if (already_encountered & 1)
{
- msg (SE, _("
REORDER subcommand may be given at most once.")
);
+ msg (SE, _("
%s subcommand may be given at most once."), "REORDER"
);
goto done;
}
already_encountered |= 1;
goto done;
}
already_encountered |= 1;
@@
-138,13
+138,13
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
"of variables."));
goto done;
}
"of variables."));
goto done;
}
- dict_get_vars_mutable (dataset_dict (ds), &v, &nv,
1u <<
DC_SYSTEM);
+ dict_get_vars_mutable (dataset_dict (ds), &v, &nv, DC_SYSTEM);
}
else
{
if (!lex_match (lexer, '('))
{
}
else
{
if (!lex_match (lexer, '('))
{
- msg (SE, _("`(' expected on
REORDER subcommand.")
);
+ msg (SE, _("`(' expected on
%s subcommand."), "REORDER"
);
free (v);
goto done;
}
free (v);
goto done;
}
@@
-174,7
+174,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
{
if (already_encountered & 2)
{
{
if (already_encountered & 2)
{
- msg (SE, _("
RENAME subcommand may be given at most once.")
);
+ msg (SE, _("
%s subcommand may be given at most once."), "RENAME"
);
goto done;
}
already_encountered |= 2;
goto done;
}
already_encountered |= 2;
@@
-187,7
+187,7
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (!lex_match (lexer, '('))
{
if (!lex_match (lexer, '('))
{
- msg (SE, _("`(' expected on
RENAME subcommand.")
);
+ msg (SE, _("`(' expected on
%s subcommand."), "RENAME"
);
goto done;
}
if (!parse_variables (lexer, dataset_dict (ds),
goto done;
}
if (!parse_variables (lexer, dataset_dict (ds),
@@
-206,9
+206,8
@@
cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (prev_nv_1 != vm.rename_cnt)
{
msg (SE, _("Differing number of variables in old name list "
if (prev_nv_1 != vm.rename_cnt)
{
msg (SE, _("Differing number of variables in old name list "
- "(%d) and in new name list (%d)."),
- (int) (vm.rename_cnt - prev_nv_2),
- (int) (prev_nv_1 - prev_nv_2));
+ "(%zu) and in new name list (%zu)."),
+ vm.rename_cnt - prev_nv_2, prev_nv_1 - prev_nv_2);
for (i = 0; i < prev_nv_1; i++)
free (vm.new_names[i]);
free (vm.new_names);
for (i = 0; i < prev_nv_1; i++)
free (vm.new_names[i]);
free (vm.new_names);
@@
-368,7
+367,7
@@
compare_variables_given_ordering (const void *a_, const void *b_,
struct var_renaming
{
struct variable *var;
struct var_renaming
{
struct variable *var;
- char new_name[
LONG
_NAME_LEN + 1];
+ char new_name[
VAR
_NAME_LEN + 1];
};
/* A algo_compare_func that compares new_name members in struct
};
/* A algo_compare_func that compares new_name members in struct