projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better tests
[pspp]
/
src
/
data
/
datasheet.c
diff --git
a/src/data/datasheet.c
b/src/data/datasheet.c
index 2847703d1e8f432556ae70a428a167a6ed56599b..74da1116a579e539178461917c5561259b557544 100644
(file)
--- a/
src/data/datasheet.c
+++ b/
src/data/datasheet.c
@@
-175,7
+175,7
@@
value_to_data (const union value *value_, int width)
if (width == 0)
return &value->f;
else
if (width == 0)
return &value->f;
else
- return value
_str_rw (value, width)
;
+ return value
->s
;
}
/* Returns the number of bytes needed to store all the values in
}
/* Returns the number of bytes needed to store all the values in
@@
-604,8
+604,8
@@
datasheet_get_value (const struct datasheet *ds, casenumber row,
successful, false on I/O error. On failure, ROW might be
partially modified or corrupted. */
bool
successful, false on I/O error. On failure, ROW might be
partially modified or corrupted. */
bool
-datasheet_put_value (struct datasheet *ds
UNUSED, casenumber row UNUSED
,
- size_t column
UNUSED, const union value *value UNUSED
)
+datasheet_put_value (struct datasheet *ds
, casenumber row
,
+ size_t column
, const union value *value
)
{
return rw_case (ds, OP_WRITE, row, column, 1, (union value *) value);
}
{
return rw_case (ds, OP_WRITE, row, column, 1, (union value *) value);
}
@@
-625,37
+625,37
@@
datasheet_insert_rows (struct datasheet *ds,
while (cnt > 0)
{
unsigned long first_phy;
while (cnt > 0)
{
unsigned long first_phy;
- unsigned long
phy_cnt
;
+ unsigned long
n_phys
;
unsigned long i;
/* Allocate physical rows from the pool of available
rows. */
unsigned long i;
/* Allocate physical rows from the pool of available
rows. */
- if (!axis_allocate (ds->rows, cnt, &first_phy, &
phy_cnt
))
+ if (!axis_allocate (ds->rows, cnt, &first_phy, &
n_phys
))
{
/* No rows were available. Extend the row axis to make
some new ones available. */
{
/* No rows were available. Extend the row axis to make
some new ones available. */
-
phy_cnt
= cnt;
+
n_phys
= cnt;
first_phy = axis_extend (ds->rows, cnt);
}
/* Insert the new rows into the row mapping. */
first_phy = axis_extend (ds->rows, cnt);
}
/* Insert the new rows into the row mapping. */
- axis_insert (ds->rows, before, first_phy,
phy_cnt
);
+ axis_insert (ds->rows, before, first_phy,
n_phys
);
/* Initialize the new rows. */
/* Initialize the new rows. */
- for (i = 0; i <
phy_cnt
; i++)
+ for (i = 0; i <
n_phys
; i++)
if (!datasheet_put_row (ds, before + i, c[i]))
{
while (++i < cnt)
case_unref (c[i]);
if (!datasheet_put_row (ds, before + i, c[i]))
{
while (++i < cnt)
case_unref (c[i]);
- datasheet_delete_rows (ds, before - added,
phy_cnt
+ added);
+ datasheet_delete_rows (ds, before - added,
n_phys
+ added);
return false;
}
/* Advance. */
return false;
}
/* Advance. */
- c +=
phy_cnt
;
- cnt -=
phy_cnt
;
- before +=
phy_cnt
;
- added +=
phy_cnt
;
+ c +=
n_phys
;
+ cnt -=
n_phys
;
+ before +=
n_phys
;
+ added +=
n_phys
;
}
return true;
}
}
return true;
}
@@
-734,10
+734,10
@@
datasheet_reader_destroy (struct casereader *reader UNUSED, void *ds_)
/* "advance" function for the datasheet random casereader. */
static void
datasheet_reader_advance (struct casereader *reader UNUSED, void *ds_,
/* "advance" function for the datasheet random casereader. */
static void
datasheet_reader_advance (struct casereader *reader UNUSED, void *ds_,
- casenumber
case_cnt
)
+ casenumber
n_cases
)
{
struct datasheet *ds = ds_;
{
struct datasheet *ds = ds_;
- datasheet_delete_rows (ds, 0,
case_cnt
);
+ datasheet_delete_rows (ds, 0,
n_cases
);
}
/* Random casereader class for a datasheet. */
}
/* Random casereader class for a datasheet. */
@@
-819,7
+819,7
@@
rw_case (struct datasheet *ds, enum rw_op op,
assert (start_column + n_columns <= datasheet_get_n_columns (ds));
prow = axis_map (ds->rows, lrow);
assert (start_column + n_columns <= datasheet_get_n_columns (ds));
prow = axis_map (ds->rows, lrow);
- for (i = 0; i < n_columns;
)
+ for (i = 0; i < n_columns;)
{
struct source *source = columns[i].source;
size_t j;
{
struct source *source = columns[i].source;
size_t j;