Revert "Fixed a use after free error when manipulating datasets."

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

diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c
index 86dfe48c0c43c296c2e21d4446585959a55ef018..9cd118c758673b93eb89687124f1b95d96954f01 100644 (file)
--- a/src/data/spreadsheet-reader.c
+++ b/src/data/spreadsheet-reader.c
@@ -29,18 +29,6 @@
 #include <gl/c-xvasprintf.h>
 #include <stdlib.h>
 
-#ifdef ODF_READ_SUPPORT
-static const bool ODF_READING_SUPPORTED = true;
-#else
-static const bool ODF_READING_SUPPORTED = false;
-#endif
-
-#ifdef GNM_READ_SUPPORT
-static const bool GNM_READING_SUPPORTED = true;
-#else
-static const bool GNM_READING_SUPPORTED = false;
-#endif
-
 void
 spreadsheet_ref (struct spreadsheet *s)
 {
@@ -53,12 +41,10 @@ spreadsheet_unref (struct spreadsheet *s)
   switch (s->type)
     {
     case SPREADSHEET_ODS:
-      assert (ODF_READING_SUPPORTED);
       ods_unref (s);
       break;
 
     case SPREADSHEET_GNUMERIC:
-      assert (GNM_READING_SUPPORTED);
       gnumeric_unref (s);
       break;
     default:
@@ -72,13 +58,11 @@ struct casereader *
 spreadsheet_make_reader (struct spreadsheet *s,
                          const struct spreadsheet_read_options *opts)
 {
-  if (ODF_READING_SUPPORTED)
-    if ( s->type == SPREADSHEET_ODS)
-      return ods_make_reader (s, opts);
+  if (s->type == SPREADSHEET_ODS)
+    return ods_make_reader (s, opts);
 
-  if (GNM_READING_SUPPORTED)
-    if ( s->type == SPREADSHEET_GNUMERIC)
-      return gnumeric_make_reader (s, opts);
+  if (s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_make_reader (s, opts);
 
   return NULL;
 }
@@ -86,13 +70,11 @@ spreadsheet_make_reader (struct spreadsheet *s,
 const char *
 spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
 {
-  if (ODF_READING_SUPPORTED)
-    if ( s->type == SPREADSHEET_ODS)
-      return ods_get_sheet_name (s, n);
+  if (s->type == SPREADSHEET_ODS)
+    return ods_get_sheet_name (s, n);
 
-  if (GNM_READING_SUPPORTED)
-    if ( s->type == SPREADSHEET_GNUMERIC)
-      return gnumeric_get_sheet_name (s, n);
+  if (s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_get_sheet_name (s, n);
 
   return NULL;
 }
@@ -101,13 +83,11 @@ spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
 char *
 spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
 {
-  if (ODF_READING_SUPPORTED)
-    if ( s->type == SPREADSHEET_ODS)
-      return ods_get_sheet_range (s, n);
+  if (s->type == SPREADSHEET_ODS)
+    return ods_get_sheet_range (s, n);
 
-  if (GNM_READING_SUPPORTED)
-    if ( s->type == SPREADSHEET_GNUMERIC)
-      return gnumeric_get_sheet_range (s, n);
+  if (s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_get_sheet_range (s, n);
 
   return NULL;
 }
@@ -205,8 +185,8 @@ create_cell_ref (int col0, int row0)
   char *cs0 ;
   char *s ;
 
-  if ( col0 < 0) return NULL;
-  if ( row0 < 0) return NULL;
+  if (col0 < 0) return NULL;
+  if (row0 < 0) return NULL;
 
   cs0 =  int_to_ps26 (col0);
   s =  c_xasprintf ("%s%d", cs0, row0 + 1);
@@ -249,7 +229,7 @@ convert_cell_ref (const char *ref,
   int n = sscanf (ref, "%4[a-zA-Z]%d:%4[a-zA-Z]%d",
              startcol, &startrow,
              stopcol, &stoprow);
-  if ( n != 4)
+  if (n != 4)
     return false;
 
   str_uppercase (startcol);