projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.
[pspp]
/
src
/
language
/
stats
/
sort-criteria.c
diff --git
a/src/language/stats/sort-criteria.c
b/src/language/stats/sort-criteria.c
index 965e7d09dd95f8f77c37be36ea838d7b5540959a..36466cd410f9bfdb89a2db6588fbbe6ba3c6a21d 100644
(file)
--- a/
src/language/stats/sort-criteria.c
+++ b/
src/language/stats/sort-criteria.c
@@
-42,7
+42,7
@@
parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
const struct variable ***vars, bool *saw_direction)
{
const struct variable **local_vars = NULL;
const struct variable ***vars, bool *saw_direction)
{
const struct variable **local_vars = NULL;
- size_t
var_cnt
= 0;
+ size_t
n_vars
= 0;
if (vars == NULL)
vars = &local_vars;
if (vars == NULL)
vars = &local_vars;
@@
-53,12
+53,12
@@
parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
do
{
do
{
- size_t prev_
var_cnt = var_cnt
;
+ size_t prev_
n_vars = n_vars
;
enum subcase_direction direction;
size_t i;
/* Variables. */
enum subcase_direction direction;
size_t i;
/* Variables. */
- if (!parse_variables_const (lexer, dict, vars, &
var_cnt
,
+ if (!parse_variables_const (lexer, dict, vars, &
n_vars
,
PV_APPEND | PV_NO_SCRATCH))
goto error;
PV_APPEND | PV_NO_SCRATCH))
goto error;
@@
-82,7
+82,7
@@
parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
else
direction = SC_ASCEND;
else
direction = SC_ASCEND;
- for (i = prev_
var_cnt; i < var_cnt
; i++)
+ for (i = prev_
n_vars; i < n_vars
; i++)
{
const struct variable *var = (*vars)[i];
if (!subcase_add_var (ordering, var, direction))
{
const struct variable *var = (*vars)[i];
if (!subcase_add_var (ordering, var, direction))