X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fspreadsheet-reader.h;h=c03cf71642135f0ef12331e247a4fe44d58fb9a7;hb=f7d622c96c3a9e10447a23c1efb9e027c8bde7cf;hp=960d076b38bdb42d060240c667459650c0fddd97;hpb=acb9e3de8a50ad77df80375d90a4a4b526e42c1c;p=pspp

diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index 960d076b38..c03cf71642 100644
--- a/src/data/spreadsheet-reader.h
+++ b/src/data/spreadsheet-reader.h
@@ -45,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,7 +59,7 @@ enum spreadsheet_type
 
 struct spreadsheet
 {
-  const char *file_name;
+  char *file_name;
 
   enum spreadsheet_type type;
 
@@ -68,6 +68,8 @@ struct spreadsheet
 
   /* The dictionary */
   struct dictionary *dict;
+
+  int ref_cnt;
 };
 
 
@@ -77,9 +79,11 @@ 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, int coli, int rowi);
+char * create_cell_ref (int col0, int row0);
+char *create_cell_range (int col0, int row0, int coli, int rowi);
 
-void spreadsheet_close (struct spreadsheet *);
+void spreadsheet_unref (struct spreadsheet *);
+void spreadsheet_ref (struct spreadsheet *);