X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fsort-criteria.c;h=965e7d09dd95f8f77c37be36ea838d7b5540959a;hb=d416357a9e9c23251ff1357f0f1c3ba5ac48223e;hp=a8c1ff13d221424119a348320ba7b0549e804165;hpb=da1bf03a84fa10f04e8c5438f22b523f0480dd7d;p=pspp diff --git a/src/language/stats/sort-criteria.c b/src/language/stats/sort-criteria.c index a8c1ff13d2..965e7d09dd 100644 --- a/src/language/stats/sort-criteria.c +++ b/src/language/stats/sort-criteria.c @@ -44,7 +44,7 @@ parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict, const struct variable **local_vars = NULL; size_t var_cnt = 0; - if (vars == NULL) + if (vars == NULL) vars = &local_vars; *vars = NULL; @@ -71,7 +71,7 @@ parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict, direction = SC_ASCEND; else { - lex_error_expecting (lexer, "A", "D", NULL_SENTINEL); + lex_error_expecting (lexer, "A", "D"); goto error; } if (!lex_force_match (lexer, T_RPAREN)) @@ -82,12 +82,12 @@ parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict, else direction = SC_ASCEND; - for (i = prev_var_cnt; i < var_cnt; i++) + for (i = prev_var_cnt; i < var_cnt; i++) { const struct variable *var = (*vars)[i]; if (!subcase_add_var (ordering, var, direction)) msg (SW, _("Variable %s specified twice in sort criteria."), - var_get_name (var)); + var_get_name (var)); } } while (lex_token (lexer) == T_ID