Fewer memory leaks

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

diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c
index efaafa30c597cd3a6c3528c96e9df995d8313914..fc1dfa8dd5dde8d4b980ef784bf2ebc2f507f023 100644 (file)
--- a/src/data/spreadsheet-reader.c
+++ b/src/data/spreadsheet-reader.c
@@ -18,6 +18,7 @@
 
 #include "spreadsheet-reader.h"
 
+#include <libpspp/assertion.h>
 #include "gnumeric-reader.h"
 #include "ods-reader.h"
 
@@ -28,21 +29,61 @@
 #include <gl/c-xvasprintf.h>
 #include <stdlib.h>
 
-struct spreadsheet * 
-spreadsheet_open (const char *filename)
+
+void 
+spreadsheet_destroy (struct spreadsheet *s)
 {
-  struct spreadsheet *ss = NULL;
+  switch (s->type)
+    {
+    case SPREADSHEET_ODS:
+      ods_destroy (s);
+      break;
+    case SPREADSHEET_GNUMERIC:
+      gnumeric_destroy (s);
+      break;
+    default:
+      NOT_REACHED ();
+      break;
+    }
+}
 
-  ss = ods_probe (filename, true);
-  
-  return ss;
+
+struct casereader * 
+spreadsheet_make_reader (struct spreadsheet *s, const struct spreadsheet_read_options *opts)
+{
+  if ( s->type == SPREADSHEET_ODS)
+    return ods_make_reader (s, opts);
+  if ( s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_make_reader (s, opts);
+
+  return NULL;
 }
 
-void 
-spreadsheet_close (UNUSED struct spreadsheet *spreadsheet)
+const char * 
+spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
 {
+  if ( s->type == SPREADSHEET_ODS)
+    return ods_get_sheet_name (s, n);
+
+  if ( s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_get_sheet_name (s, n);
+
+  return NULL;
+}
+
+char * 
+spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
+{
+  if ( s->type == SPREADSHEET_ODS)
+    return ods_get_sheet_range (s, n);
+
+  if ( s->type == SPREADSHEET_GNUMERIC)
+    return gnumeric_get_sheet_range (s, n);
+
+  return NULL;
 }
 
+
 #define RADIX 26
 
 static void
@@ -112,7 +153,7 @@ int_to_ps26 (int i)
   i -= lower;
   i += base;
 
-  ret = xmalloc (exp);
+  ret = xmalloc (exp + 1);
 
   exp = 0;
   do