Make the spreadsheet reader responsible for destroying its opts

diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index 5cfd81d7e1caf84b3eab536171bc98203bc878e7..960d076b38bdb42d060240c667459650c0fddd97 100644 (file)
--- a/src/data/spreadsheet-reader.h
+++ b/src/data/spreadsheet-reader.h
@@ -30,9 +30,9 @@ struct casereeader;
 */
 struct spreadsheet_read_options
 {
-  const char *sheet_name ; /* The name of the sheet to open (in UTF-8) */
+  char *sheet_name ;       /* The name of the sheet to open (in UTF-8) */
   int sheet_index ;        /* The index of the sheet to open (only used if sheet_name is NULL) */
-  const char *cell_range ; /* The cell range (in UTF-8) */
+  char *cell_range ;       /* The cell range (in UTF-8) */
   bool read_names ;        /* True if the first row is to be used as the names of the variables */
   int asw ;                /* The width of string variables in the created dictionary */
 };

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index 2879e34a4bb3f329a3ab244cd8bb4c6b75f6e228..70f6c89cbc13df4f24f2c0fb85b64be1cdeab361 100644 (file)
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -57,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);
 
@@ -82,7 +83,7 @@ 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;
 
@@ -110,10 +111,8 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
          dataset_set_dict (ds, dict);
          dataset_set_source (ds, reader);
          free (tok);
-         destroy_spreadsheet_read_info (&opts);
          return CMD_SUCCESS;
        }
-      destroy_spreadsheet_read_info (&opts);
     }
   else
     msg (SE, _("Unsupported TYPE %s."), tok);
@@ -122,6 +121,7 @@ cmd_get_data (struct lexer *lexer, struct dataset *ds)
 
 
  error:
+  destroy_spreadsheet_read_info (&opts);
   free (tok);
   return CMD_FAILURE;
 }
@@ -682,4 +682,5 @@ static void
 destroy_spreadsheet_read_info (struct spreadsheet_read_options *opts)
 {
   free (opts->cell_range);
+  free (opts->sheet_name);
 }