zip-writer: Write size and CRC in local directory when possible.

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

diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index 9a46b35e9eb6a255e78403e9cfa242f6c133a754..5e7eaa6e4603a128ca2368934e018f0b879425b4 100644 (file)
--- 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
   {
@@ -77,7 +77,8 @@ 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_destroy (struct spreadsheet *);