X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fspreadsheet-reader.h;h=5e7eaa6e4603a128ca2368934e018f0b879425b4;hb=eb06da6a334bc37108cdce9bfc7f26cfcb2003ee;hp=f6380e31c1af537e9273f21b5f590e056eecf5ec;hpb=ddf35b11f8525281dd9e524a5d322a80bf56a24f;p=pspp

diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index f6380e31c1..5e7eaa6e46 100644
--- a/src/data/spreadsheet-reader.h
+++ b/src/data/spreadsheet-reader.h
@@ -19,6 +19,8 @@
 
 #include <stdbool.h>
 
+struct casereeader;
+
 /* Default width of string variables. */
 #define SPREADSHEET_DEFAULT_WIDTH 8
 
@@ -31,11 +33,6 @@ struct spreadsheet_read_options
   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) */
   char *cell_range ;       /* The cell range (in UTF-8) */
-};
-
-
-struct spreadsheet_read_info
-{
   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 */
 };
@@ -48,9 +45,9 @@ bool convert_cell_ref (const char *ref,
 		       int *coli, int *rowi);
 
 
-#define _xml(X) (CHAR_CAST (const xmlChar *, X))
+#define _xml(X) (CHAR_CAST (const xmlChar *, (X)))
 
-#define _xmlchar_to_int(X) (atoi(CHAR_CAST (const char *, X)))
+#define _xmlchar_to_int(X) ((X) ? atoi (CHAR_CAST (const char *, (X))) : -1)
 
 enum spreadsheet_type
   {
@@ -59,6 +56,7 @@ enum spreadsheet_type
     SPREADSHEET_ODS
   };
 
+
 struct spreadsheet
 {
   const char *file_name;
@@ -73,20 +71,19 @@ struct spreadsheet
 };
 
 
-char *create_cell_ref (int col0, int row0, int coli, int rowi);
+struct casereader * spreadsheet_make_reader (struct spreadsheet *, const struct spreadsheet_read_options *);
+
+const char * spreadsheet_get_sheet_name (struct spreadsheet *s, int n);
+char * spreadsheet_get_sheet_range (struct spreadsheet *s, int n);
+
+
+char * create_cell_ref (int col0, int row0);
+char *create_cell_range (int col0, int row0, int coli, int rowi);
+
+void spreadsheet_destroy (struct spreadsheet *);
+
 
-/* 
-   Attempt to open the file called FILENAME as a spreadsheet.
-   It is not known a priori, what type of spreadsheet FILENAME is, or
-   even if it is a spreadsheet at all.
-   If it fails to open, then it will return NULL without any error or
-   warning messages.
- */
-struct spreadsheet * spreadsheet_open (const char *filename);
-void spreadsheet_close (struct spreadsheet *);
 
-struct casereeader;
-struct casereader * spreadsheet_make_reader (struct spreadsheet *s);
 
 
 #define SPREADSHEET_CAST(X) ((struct spreadsheet *)(X))