#include <sys/types.h>
#include <assert.h>
#include <stdlib.h>
-
#include "alloc.h"
#include "error.h"
#include "lexer.h"
#include "sort.h"
#include "var.h"
-
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
static bool is_terminator(int tok, const int *terminators);
*/
struct sort_criteria *
sort_parse_criteria (const struct dictionary *dict,
- struct variable ***vars, int *var_cnt,
+ struct variable ***vars, size_t *var_cnt,
bool *saw_direction,
const int *terminators
)
do
{
- int prev_var_cnt = *var_cnt;
+ size_t prev_var_cnt = *var_cnt;
enum sort_direction direction;
/* Variables. */
else
direction = SRT_ASCEND;
- criteria->crits = xrealloc (criteria->crits,
- sizeof *criteria->crits * *var_cnt);
+ criteria->crits = xnrealloc (criteria->crits,
+ *var_cnt, sizeof *criteria->crits);
criteria->crit_cnt = *var_cnt;
for (; prev_var_cnt < criteria->crit_cnt; prev_var_cnt++)
{