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
/
data-io
/
trim.c
diff --git
a/src/language/data-io/trim.c
b/src/language/data-io/trim.c
index b9983ef49ef34c2cee318089ac62a2e85158d78c..4616b431d22cb1303810e8679899514d0589f5bb 100644
(file)
--- a/
src/language/data-io/trim.c
+++ b/
src/language/data-io/trim.c
@@
-276,7
+276,7
@@
parse_dict_drop (struct lexer *lexer, struct dictionary *dict)
dict_delete_vars (dict, v, nv);
free (v);
dict_delete_vars (dict, v, nv);
free (v);
- if (dict_get_
var_cnt
(dict) == 0)
+ if (dict_get_
n_vars
(dict) == 0)
{
msg (SE, _("Cannot DROP all variables from dictionary."));
return false;
{
msg (SE, _("Cannot DROP all variables from dictionary."));
return false;
@@
-302,16
+302,16
@@
parse_dict_keep (struct lexer *lexer, struct dictionary *dict)
dict_reorder_vars (dict, v, nv);
/* Delete the remaining variables. */
dict_reorder_vars (dict, v, nv);
/* Delete the remaining variables. */
- if (dict_get_
var_cnt
(dict) == nv)
+ if (dict_get_
n_vars
(dict) == nv)
{
free (v);
return true;
}
{
free (v);
return true;
}
- v = xnrealloc (v, dict_get_
var_cnt
(dict) - nv, sizeof *v);
- for (i = nv; i < dict_get_
var_cnt
(dict); i++)
+ v = xnrealloc (v, dict_get_
n_vars
(dict) - nv, sizeof *v);
+ for (i = nv; i < dict_get_
n_vars
(dict); i++)
v[i - nv] = dict_get_var (dict, i);
v[i - nv] = dict_get_var (dict, i);
- dict_delete_vars (dict, v, dict_get_
var_cnt
(dict) - nv);
+ dict_delete_vars (dict, v, dict_get_
n_vars
(dict) - nv);
free (v);
return true;
free (v);
return true;