projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63683e1
)
Delete ods_file_casereader_clone function
author
John Darrington
<john@darrington.wattle.id.au>
Thu, 7 Mar 2013 19:20:57 +0000
(20:20 +0100)
committer
John Darrington
<john@darrington.wattle.id.au>
Thu, 7 Mar 2013 19:20:57 +0000
(20:20 +0100)
src/data/ods-reader.c
patch
|
blob
|
history
diff --git
a/src/data/ods-reader.c
b/src/data/ods-reader.c
index a36a020a0b063eb4b31ab84c94838ec071240b5c..72cfe21ae640a4ff595d4df4de48446d95858ca0 100644
(file)
--- a/
src/data/ods-reader.c
+++ b/
src/data/ods-reader.c
@@
-68,14
+68,13
@@
ods_open_reader (const struct spreadsheet_read_options *opts,
static void ods_file_casereader_destroy (struct casereader *, void *);
static struct ccase *ods_file_casereader_read (struct casereader *, void *);
static void ods_file_casereader_destroy (struct casereader *, void *);
static struct ccase *ods_file_casereader_read (struct casereader *, void *);
-static struct casereader *ods_file_casereader_clone (struct casereader *, void *);
static const struct casereader_class ods_file_casereader_class =
{
ods_file_casereader_read,
ods_file_casereader_destroy,
static const struct casereader_class ods_file_casereader_class =
{
ods_file_casereader_read,
ods_file_casereader_destroy,
-
ods_file_casereader_clone
,
+
NULL
,
NULL,
};
NULL,
};
@@
-142,6
+141,7
@@
void
ods_destroy (struct spreadsheet *s)
{
struct ods_reader *r = s;
ods_destroy (struct spreadsheet *s)
{
struct ods_reader *r = s;
+
if (--r->ref_cnt == 0)
{
int i;
if (--r->ref_cnt == 0)
{
int i;
@@
-228,16
+228,6
@@
ods_get_sheet_range (struct spreadsheet *s, int n)
}
}
-static struct casereader *
-ods_file_casereader_clone (struct casereader *r_, void *s)
-{
- struct ods_reader *r = r_;
-
- printf ("%s:%d CLONE reffing %p %d\n", __FILE__, __LINE__, s, r->ref_cnt);
-
- return r_;
-}
-
static void
ods_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
{
static void
ods_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
{