X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fspreadsheet-reader.c;h=86dfe48c0c43c296c2e21d4446585959a55ef018;hb=f790dbda9d498eef9c9c0a49078adbeecf768d56;hp=294b93cec5d3f5190d5bddde902ea6e0c0d273d5;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp

diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c
index 294b93cec5..86dfe48c0c 100644
--- a/src/data/spreadsheet-reader.c
+++ b/src/data/spreadsheet-reader.c
@@ -29,22 +29,38 @@
 #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)
+{
+  s->ref_cnt++;
+}
 
-void 
-spreadsheet_destroy (struct spreadsheet *s)
+void
+spreadsheet_unref (struct spreadsheet *s)
 {
   switch (s->type)
     {
-#ifdef ODF_READ_SUPPORT
     case SPREADSHEET_ODS:
-      ods_destroy (s);
+      assert (ODF_READING_SUPPORTED);
+      ods_unref (s);
       break;
-#endif
-#ifdef GNM_READ_SUPPORT
+
     case SPREADSHEET_GNUMERIC:
-      gnumeric_destroy (s);
+      assert (GNM_READING_SUPPORTED);
+      gnumeric_unref (s);
       break;
-#endif
     default:
       NOT_REACHED ();
       break;
@@ -52,49 +68,46 @@ spreadsheet_destroy (struct spreadsheet *s)
 }
 
 
-struct casereader * 
-spreadsheet_make_reader (struct spreadsheet *s UNUSED,
-                         const struct spreadsheet_read_options *opts UNUSED)
+struct casereader *
+spreadsheet_make_reader (struct spreadsheet *s,
+                         const struct spreadsheet_read_options *opts)
 {
-#ifdef ODS_READ_SUPPORT
-  if ( s->type == SPREADSHEET_ODS)
-    return ods_make_reader (s, opts);
-#endif
-#ifdef GNM_READ_SUPPORT
-  if ( s->type == SPREADSHEET_GNUMERIC)
-    return gnumeric_make_reader (s, opts);
-#endif
+  if (ODF_READING_SUPPORTED)
+    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);
 
   return NULL;
 }
 
-const char * 
+const char *
 spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
 {
-#ifdef ODF_READ_SUPPORT
-  if ( s->type == SPREADSHEET_ODS)
-    return ods_get_sheet_name (s, n);
-#endif
-#ifdef GNM_READ_SUPPORT
-  if ( s->type == SPREADSHEET_GNUMERIC)
-    return gnumeric_get_sheet_name (s, n);
-#endif
+  if (ODF_READING_SUPPORTED)
+    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);
 
   return NULL;
 }
 
-char * 
+
+char *
 spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
 {
-#ifdef ODF_READ_SUPPORT
-  if ( s->type == SPREADSHEET_ODS)
-    return ods_get_sheet_range (s, n);
-#endif
+  if (ODF_READING_SUPPORTED)
+    if ( s->type == SPREADSHEET_ODS)
+      return ods_get_sheet_range (s, n);
 
-#ifdef GNM_READ_SUPPORT
-  if ( s->type == SPREADSHEET_GNUMERIC)
-    return gnumeric_get_sheet_range (s, n);
-#endif
+  if (GNM_READING_SUPPORTED)
+    if ( s->type == SPREADSHEET_GNUMERIC)
+      return gnumeric_get_sheet_range (s, n);
 
   return NULL;
 }
@@ -161,7 +174,7 @@ int_to_ps26 (int i)
   while (i > lower + base - 1)
     {
       lower += base;
-      base *= RADIX;      
+      base *= RADIX;
       assert (base > 0);
       exp++;
     }