X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Frank.q;h=77a6dbe85e41d97b14e1bec6e7c813731cc3523a;hb=0d1247a98f058356ba1cf24c26f642004ba5fbc5;hp=ddaa020c4eb3c6307f91ea93b41a05eaee80fb51;hpb=4de79b34b329d1da6cdeb145993d3efd911e2967;p=pspp-builds.git diff --git a/src/rank.q b/src/rank.q index ddaa020c..77a6dbe8 100644 --- a/src/rank.q +++ b/src/rank.q @@ -71,12 +71,12 @@ struct rank_spec static struct rank_spec *rank_specs; -static int n_rank_specs; +static size_t n_rank_specs; static struct sort_criteria *sc; static struct variable **group_vars; -static int n_group_vars; +static size_t n_group_vars; static struct cmd_rank cmd; @@ -87,7 +87,7 @@ int cmd_rank(void); int cmd_rank(void) { - int i; + size_t i; n_rank_specs = 0; if ( !parse_rank(&cmd) ) @@ -224,11 +224,11 @@ parse_rank_function(struct cmd_rank *cmd UNUSED, enum RANK_FUNC f) int var_count = 0; n_rank_specs++; - rank_specs = xrealloc(rank_specs, n_rank_specs * sizeof *rank_specs); + rank_specs = xnrealloc(rank_specs, n_rank_specs, sizeof *rank_specs); rank_specs[n_rank_specs - 1].rfunc = f; rank_specs[n_rank_specs - 1].destvars = - xcalloc(sc->crit_cnt ,sizeof (struct variable *)); + xcalloc (sc->crit_cnt, sizeof (struct variable *)); if (lex_match_id("INTO")) {