… | |
… | |
506 | psiconv_progress(lev+1,off,"Going to read the sheet workbook section"); |
506 | psiconv_progress(lev+1,off,"Going to read the sheet workbook section"); |
507 | if (!(*result = malloc(sizeof(**result)))) |
507 | if (!(*result = malloc(sizeof(**result)))) |
508 | goto ERROR1; |
508 | goto ERROR1; |
509 | |
509 | |
510 | psiconv_progress(lev+2,off+len, |
510 | psiconv_progress(lev+2,off+len, |
511 | "Going to read the initial byte (%02x or $02xexpected)", |
511 | "Going to read the initial byte (%02x or %02x expected)", |
512 | 0x02,0x04); |
512 | 0x02,0x04); |
513 | temp = psiconv_read_u8(buf,lev+2,off+len,&res); |
513 | temp = psiconv_read_u8(buf,lev+2,off+len,&res); |
514 | if (res) |
514 | if (res) |
515 | goto ERROR2; |
515 | goto ERROR2; |
516 | if ((temp != 0x04) && temp !=0x02) { |
516 | if ((temp != 0x04) && temp !=0x02) { |
… | |
… | |
584 | NULL,&(*result)->worksheets))) |
584 | NULL,&(*result)->worksheets))) |
585 | goto ERROR5; |
585 | goto ERROR5; |
586 | |
586 | |
587 | if (with_name) { |
587 | if (with_name) { |
588 | psiconv_progress(lev+2,off+len,"Going to read the name section"); |
588 | psiconv_progress(lev+2,off+len,"Going to read the name section"); |
589 | |
|
|
590 | if ((res = psiconv_parse_sheet_name_section(buf,lev+2,name_off,NULL, |
589 | if ((res = psiconv_parse_sheet_name_section(buf,lev+2,name_off,NULL, |
591 | &(*result)->name))) |
590 | &(*result)->name))) |
592 | goto ERROR6; |
591 | goto ERROR6; |
593 | } else |
592 | } else |
594 | (*result)->name = NULL; |
593 | (*result)->name = NULL; |