X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fods-reader.c;h=c2e7a0e354933309d4610574a73007342ec8d61b;hb=86306a18a4933def434af0a64e22d9c13de61532;hp=c5ada6e09101bc3977ee2ecb67af59b0621aed6f;hpb=83239cbb53294662025d5ee957d7e24e5feb66a9;p=pspp diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c index c5ada6e091..c2e7a0e354 100644 --- a/src/data/ods-reader.c +++ b/src/data/ods-reader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc. + Copyright (C) 2011, 2012, 2013, 2016 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,6 +43,19 @@ ods_open_reader (const struct spreadsheet_read_options *opts, return NULL; } +struct casereader * +ods_make_reader (struct spreadsheet *spreadsheet, + const struct spreadsheet_read_options *opts) +{ + return NULL; +} + + +void +ods_unref (struct spreadsheet *r) +{ +} + #else #include "libpspp/zip-reader.h" @@ -170,7 +183,9 @@ ods_unref (struct spreadsheet *s) { xmlFree (r->sheets[i].name); } - + + dict_destroy (r->dict); + zip_reader_destroy (r->zreader); free (r->sheets); free (s->file_name); @@ -919,8 +934,6 @@ ods_make_reader (struct spreadsheet *spreadsheet, free (var_spec); - dict_destroy (r->spreadsheet.dict); - r->spreadsheet.dict = NULL; ods_file_casereader_destroy (NULL, r); return NULL;