Make the spreadsheet reader responsible for destroying its opts

[pspp] / src / language / data-io / get-data.c

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index cfa33d115239010244e082705d45e2bd1b885df1..70f6c89cbc13df4f24f2c0fb85b64be1cdeab361 100644 (file)
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -1,5 +1,6 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012,
+                 2013 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
@@ -48,7 +49,7 @@
 static bool parse_spreadsheet (struct lexer *lexer, char **filename,
                               struct spreadsheet_read_options *opts);
 
-static void destroy_spreadsheet_read_info (struct spreadsheet_read_info *, struct spreadsheet_read_options *);
+static void destroy_spreadsheet_read_info (struct spreadsheet_read_options *);
 
 static int parse_get_txt (struct lexer *lexer, struct dataset *);
 static int parse_get_psql (struct lexer *lexer, struct dataset *);
@@ -56,6 +57,7 @@ static int parse_get_psql (struct lexer *lexer, struct dataset *);
 int
 cmd_get_data (struct lexer *lexer, struct dataset *ds)
 {
+  struct spreadsheet_read_options opts;
   char *tok = NULL;
   lex_force_match (lexer, T_SLASH);
 
@@ -81,23 +83,29 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
       char *filename = NULL;
       struct casereader *reader = NULL;
       struct dictionary *dict = NULL;
-      struct spreadsheet_read_options opts;
+
       if (!parse_spreadsheet (lexer, &filename, &opts))
        goto error;
 
       if ( 0 == strncasecmp (tok, "GNM", 3))
        {
          struct spreadsheet *spreadsheet = gnumeric_probe (filename, true);
+         if (spreadsheet == NULL)
+           goto error;
          reader = gnumeric_make_reader (spreadsheet, &opts);
          dict = spreadsheet->dict;
        }
       else if (0 == strncasecmp (tok, "ODS", 3))
        {
          struct spreadsheet *spreadsheet = ods_probe (filename, true);
+         if (spreadsheet == NULL)
+           goto error;
          reader = ods_make_reader (spreadsheet, &opts);
          dict = spreadsheet->dict;
        }
 
+      free (filename);
+
       if (reader)
        {
          dataset_set_dict (ds, dict);
@@ -109,7 +117,11 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
   else
     msg (SE, _("Unsupported TYPE %s."), tok);
 
+
+
+
  error:
+  destroy_spreadsheet_read_info (&opts);
   free (tok);
   return CMD_FAILURE;
 }
@@ -667,7 +679,8 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
 
 
 static void 
-destroy_spreadsheet_read_info (UNUSED struct spreadsheet_read_info *sri,
-                              UNUSED struct spreadsheet_read_options *opts)
+destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts)
 {
+  free (opts->cell_range);
+  free (opts->sheet_name);
 }