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
/
dictionary
/
delete-variables.c
diff --git
a/src/language/dictionary/delete-variables.c
b/src/language/dictionary/delete-variables.c
index ded5c48ad3c99829db7a8735a432a0a8cffd47f4..1c38074f63c13c43be475b9c1fa009dbad01a61a 100644
(file)
--- a/
src/language/dictionary/delete-variables.c
+++ b/
src/language/dictionary/delete-variables.c
@@
-33,7
+33,7
@@
int
cmd_delete_variables (struct lexer *lexer, struct dataset *ds)
{
struct variable **vars;
cmd_delete_variables (struct lexer *lexer, struct dataset *ds)
{
struct variable **vars;
- size_t
var_cnt
;
+ size_t
n_vars
;
bool ok;
if (proc_make_temporary_transformations_permanent (ds))
bool ok;
if (proc_make_temporary_transformations_permanent (ds))
@@
-41,9
+41,9
@@
cmd_delete_variables (struct lexer *lexer, struct dataset *ds)
"Temporary transformations will be made permanent."),
"DELETE VARIABLES", "TEMPORARY");
"Temporary transformations will be made permanent."),
"DELETE VARIABLES", "TEMPORARY");
- if (!parse_variables (lexer, dataset_dict (ds), &vars, &
var_cnt
, PV_NONE))
+ if (!parse_variables (lexer, dataset_dict (ds), &vars, &
n_vars
, PV_NONE))
goto error;
goto error;
- if (
var_cnt == dict_get_var_cnt
(dataset_dict (ds)))
+ if (
n_vars == dict_get_n_vars
(dataset_dict (ds)))
{
msg (SE, _("%s may not be used to delete all variables "
"from the active dataset dictionary. "
{
msg (SE, _("%s may not be used to delete all variables "
"from the active dataset dictionary. "
@@
-56,7
+56,7
@@
cmd_delete_variables (struct lexer *lexer, struct dataset *ds)
if (!ok)
goto error;
if (!ok)
goto error;
- dict_delete_vars (dataset_dict (ds), vars,
var_cnt
);
+ dict_delete_vars (dataset_dict (ds), vars,
n_vars
);
/* XXX A bunch of bugs conspire to make executing transformations again here
necessary, even though it shouldn't be.
/* XXX A bunch of bugs conspire to make executing transformations again here
necessary, even though it shouldn't be.