#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
"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 (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