X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Frank.q;h=77a6dbe85e41d97b14e1bec6e7c813731cc3523a;hb=a29bbbe97388bb6f9c9b4df36b448dfe5023363c;hp=2b768e54d6da04e7c869cd4ac56acbbb868c7469;hpb=c434e369b6695f8135a2914e9a425edcdd09ef35;p=pspp diff --git a/src/rank.q b/src/rank.q index 2b768e54d6..77a6dbe85e 100644 --- a/src/rank.q +++ b/src/rank.q @@ -25,6 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA #include "sort-prs.h" #include "var.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) + /* (headers) */ /* (specification) @@ -68,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; @@ -84,7 +87,7 @@ int cmd_rank(void); int cmd_rank(void) { - int i; + size_t i; n_rank_specs = 0; if ( !parse_rank(&cmd) ) @@ -221,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")) {