#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
-#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
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;
"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, '('))
{
- msg (SE, _("`(' expected on REORDER subcommand."));
+ msg (SE, _("`(' expected on %s subcommand."), "REORDER");
free (v);
goto done;
}
{
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;
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),
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);
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