Made _xml_char_to_int less prone to crashing

[pspp] / src / data / gnumeric-reader.h

diff --git a/src/data/gnumeric-reader.h b/src/data/gnumeric-reader.h
index 6bb5a6b7d9324c97ba2f4e6ff86bc67b8b7aece1..1f5a32e3a48b7cd519d41b143015d70ce8c671ea 100644 (file)
--- a/src/data/gnumeric-reader.h
+++ b/src/data/gnumeric-reader.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,21 +20,19 @@
 #include <stdbool.h>
 
 struct casereader;
+struct dictionary;
+struct spreadsheet_read_info;
+struct spreadsheet_read_options;
 
+struct spreadsheet *gnumeric_probe (const char *filename, bool report_errors);
 
-struct gnumeric_read_info
-{
-  char *sheet_name ;
-  char *file_name ;
-  char *cell_range ;
-  int sheet_index ;
-  bool read_names ;
-  int asw ;
-};
+const char * gnumeric_get_sheet_name (struct spreadsheet *s, int n);
+char * gnumeric_get_sheet_range (struct spreadsheet *s, int n);
 
-struct dictionary;
+struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet,
+                                         const struct spreadsheet_read_options *opts);
 
-struct casereader * gnumeric_open_reader (struct gnumeric_read_info *, struct dictionary **);
+void gnumeric_destroy (struct spreadsheet *r);
 
 
 #endif