projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Add auxiliary data parameter to tab_dim.
[pspp-builds.git]
/
src
/
data
/
sparse-cases.c
diff --git
a/src/data/sparse-cases.c
b/src/data/sparse-cases.c
index 13fcf7888feae74f2a2489f7ea5df3c678807a71..7abe429147a893af7a48bf88eb5db99cb25313ae 100644
(file)
--- a/
src/data/sparse-cases.c
+++ b/
src/data/sparse-cases.c
@@
-80,8
+80,8
@@
sparse_cases_clone (const struct sparse_cases *old)
struct ccase **cp;
new->memory = sparse_array_create (sizeof (struct ccase *));
struct ccase **cp;
new->memory = sparse_array_create (sizeof (struct ccase *));
- for (cp = sparse_array_
scan (old->memory, NULL
, &idx); cp != NULL;
- cp = sparse_array_
scan (old->memory, &
idx, &idx))
+ for (cp = sparse_array_
first (old->memory
, &idx); cp != NULL;
+ cp = sparse_array_
next (old->memory,
idx, &idx))
{
struct ccase **ncp = sparse_array_insert (new->memory, idx);
*ncp = case_ref (*cp);
{
struct ccase **ncp = sparse_array_insert (new->memory, idx);
*ncp = case_ref (*cp);
@@
-133,8
+133,8
@@
sparse_cases_destroy (struct sparse_cases *sc)
{
unsigned long int idx;
struct ccase **cp;
{
unsigned long int idx;
struct ccase **cp;
- for (cp = sparse_array_
scan (sc->memory, NULL
, &idx); cp != NULL;
- cp = sparse_array_
scan (sc->memory, &
idx, &idx))
+ for (cp = sparse_array_
first (sc->memory
, &idx); cp != NULL;
+ cp = sparse_array_
next (sc->memory,
idx, &idx))
case_unref (*cp);
sparse_array_destroy (sc->memory);
}
case_unref (*cp);
sparse_array_destroy (sc->memory);
}
@@
-167,8
+167,8
@@
dump_sparse_cases_to_disk (struct sparse_cases *sc)
sc->disk = case_tmpfile_create (sc->column_cnt);
sc->disk_cases = range_set_create ();
sc->disk = case_tmpfile_create (sc->column_cnt);
sc->disk_cases = range_set_create ();
- for (cp = sparse_array_
scan (sc->memory, NULL
, &idx); cp != NULL;
- cp = sparse_array_
scan (sc->memory, &
idx, &idx))
+ for (cp = sparse_array_
first (sc->memory
, &idx); cp != NULL;
+ cp = sparse_array_
next (sc->memory,
idx, &idx))
{
if (!case_tmpfile_put_case (sc->disk, idx, *cp))
{
{
if (!case_tmpfile_put_case (sc->disk, idx, *cp))
{
@@
-324,8
+324,8
@@
sparse_cases_write_columns (struct sparse_cases *sc, size_t start_column,
struct ccase **cp;
unsigned long int idx;
struct ccase **cp;
unsigned long int idx;
- for (cp = sparse_array_
scan (sc->memory, NULL
, &idx); cp != NULL;
- cp = sparse_array_
scan (sc->memory, &
idx, &idx))
+ for (cp = sparse_array_
first (sc->memory
, &idx); cp != NULL;
+ cp = sparse_array_
next (sc->memory,
idx, &idx))
{
*cp = case_unshare (*cp);
case_copy_in (*cp, start_column, values, value_cnt);
{
*cp = case_unshare (*cp);
case_copy_in (*cp, start_column, values, value_cnt);