X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fods-reader.c;h=b2efe2c5734c5c8a07dda87e39f4f8b69b75b15f;hb=faa4f310af58bc1dfd56be0575745c91a59d88b3;hp=b014a748d7bda81df41ddfd421c8172406133542;hpb=a22af84523eb716b947123186bd4f89a3d92945e;p=pspp

diff --git a/src/data/ods-reader.c b/src/data/ods-reader.c
index b014a748d7..b2efe2c573 100644
--- a/src/data/ods-reader.c
+++ b/src/data/ods-reader.c
@@ -1079,7 +1079,7 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 	   r->rsd.node_type == XML_READER_TYPE_TEXT)
 	{
 	  int col;
-	  struct xml_value *xmv = xzalloc (sizeof *xmv);
+	  struct xml_value *xmv = XZALLOC (struct xml_value);
 	  xmv->text = xmlTextReaderValue (r->rsd.xtr);
 	  xmv->value = val_string;
 	  val_string = NULL;
@@ -1094,7 +1094,7 @@ ods_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 		continue;
 	      if (r->spreadsheet.stop_col != -1 && idx > r->spreadsheet.stop_col - r->spreadsheet.start_col)
 		break;
-	      if (idx >= dict_get_var_cnt (r->spreadsheet.dict))
+	      if (idx >= dict_get_n_vars (r->spreadsheet.dict))
 		break;
 
               var = dict_get_var (r->spreadsheet.dict, idx);
@@ -1163,7 +1163,7 @@ init_reader (struct ods_reader *r, bool report_errors,
 struct spreadsheet *
 ods_probe (const char *filename, bool report_errors)
 {
-  struct ods_reader *r = xzalloc (sizeof *r);
+  struct ods_reader *r = XZALLOC (struct ods_reader);
 
   struct zip_reader *zr;
   char *error = zip_reader_create (filename, &zr);