Move file_name member from sri to spreadsheet struct

[pspp] / src / data / ods-reader.c

diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index 2ce4e7eb9ba268d188564b94a9d4dc24df0b0d42..d12223013c79367b22cdd87d717c47c57a2ffe63 100644 (file)
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -408,6 +408,7 @@ struct spreadsheet *ods_probe (const char *filename)
 
   ds_destroy (&errs);
 
+  r->spreadsheet.file_name = filename;
   return &r->spreadsheet;
 
  error:
@@ -483,7 +484,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
   if (ret < 1)
     {
       msg (MW, _("Selected sheet or range of spreadsheet `%s' is empty."),
-           gri->file_name);
+           spreadsheet->file_name);
       goto error;
     }
 
@@ -598,7 +599,7 @@ ods_make_reader (struct spreadsheet *spreadsheet,
   if ( n_var_specs ==  0 )
     {
       msg (MW, _("Selected sheet or range of spreadsheet `%s' is empty."),
-           gri->file_name);
+           spreadsheet->file_name);
       goto error;
     }