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

diff --git a/src/data/spreadsheet-reader.h b/src/data/spreadsheet-reader.h
index 9a46b35e9e..5e7eaa6e46 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
   {
@@ -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 *);