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;
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);
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);