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
/
combine-files.c
diff --git
a/src/language/data-io/combine-files.c
b/src/language/data-io/combine-files.c
index c51f04aaa947d422a9b504d69e66dc13ef5c0161..490a984a7dc98370b346a237314de63dd147dac0 100644
(file)
--- a/
src/language/data-io/combine-files.c
+++ b/
src/language/data-io/combine-files.c
@@
-414,11
+414,11
@@
combine_files (enum comb_command_type command,
for (i = 0; i < proc.n_files; i++)
{
struct comb_file *file = &proc.files[i];
for (i = 0; i < proc.n_files; i++)
{
struct comb_file *file = &proc.files[i];
- size_t src_
var_cnt = dict_get_var_cnt
(file->dict);
+ size_t src_
n_vars = dict_get_n_vars
(file->dict);
size_t j;
size_t j;
- file->mv = xnmalloc (src_
var_cnt
, sizeof *file->mv);
- for (j = 0; j < src_
var_cnt
; j++)
+ file->mv = xnmalloc (src_
n_vars
, sizeof *file->mv);
+ for (j = 0; j < src_
n_vars
; j++)
{
struct variable *src_var = dict_get_var (file->dict, j);
struct variable *dst_var = dict_lookup_var (proc.dict,
{
struct variable *src_var = dict_get_var (file->dict, j);
struct variable *dst_var = dict_lookup_var (proc.dict,
@@
-543,7
+543,7
@@
merge_dictionary (struct dictionary *const m, struct comb_file *f)
}
}
}
}
- for (i = 0; i < dict_get_
var_cnt
(d); i++)
+ for (i = 0; i < dict_get_
n_vars
(d); i++)
{
struct variable *dv = dict_get_var (d, i);
struct variable *mv = dict_lookup_var (m, var_get_name (dv));
{
struct variable *dv = dict_get_var (d, i);
struct variable *mv = dict_lookup_var (m, var_get_name (dv));
@@
-821,7
+821,7
@@
scan_table (struct comb_file *file, union value by[])
static struct ccase *
create_output_case (const struct comb_proc *proc)
{
static struct ccase *
create_output_case (const struct comb_proc *proc)
{
- size_t n_vars = dict_get_
var_cnt
(proc->dict);
+ size_t n_vars = dict_get_
n_vars
(proc->dict);
struct ccase *output;
size_t i;
struct ccase *output;
size_t i;