/[public]/psiconv/trunk/lib/psiconv/parse_sheet.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_sheet.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 128 Revision 131
… …
72 psiconv_free_character_layout(result->character); 72 psiconv_free_character_layout(result->character);
73ERROR2: 73ERROR2:
74 free(result); 74 free(result);
75ERROR1: 75ERROR1:
76 return NULL; 76 return NULL;
77}
78
79static psiconv_sheet_cell_reference_t
80 psiconv_read_var_cellref (const psiconv_buffer buf, int lev,
81 psiconv_u32 off, int *length,
82 int *status)
83{
84 int len=0;
85 int res;
86 psiconv_sheet_cell_reference_t result;
87 psiconv_u32 temp;
88
89 psiconv_progress(lev+1,off+len,"Going to read a sheet cell reference");
90 psiconv_progress(lev+2,off+len,
91 "Going to read the initial byte (%02x expected)",0x00);
92 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
93 if (res)
94 goto ERROR1;
95 if (temp != 0x00) {
96 psiconv_warn(lev+2,off+len,
97 "Sheet cell reference initial byte unknown value (ignored)");
98 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp);
99 }
100 len ++;
101
102 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
103 if (res)
104 goto ERROR1;
105 if (temp & 0xffff0000) {
106 psiconv_warn(lev+2,off+len,
107 "Sheet cell row reference to unknown row (reset)");
108 }
109 result.row.offset = temp;
110 result.row.absolute = psiconv_bool_true;
111 len += 4;
112
113 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
114 if (res)
115 goto ERROR1;
116 if (temp & 0xffff0000) {
117 psiconv_warn(lev+2,off+len,
118 "Sheet cell column reference to unknown row (reset)");
119 }
120 result.column.offset = temp;
121 result.column.absolute = psiconv_bool_true;
122 len += 4;
123
124 if (length)
125 *length = len;
126
127 psiconv_progress(lev,off+len-1,
128 "End of sheet column reference (total length: %08x)", len);
129 return result;
130ERROR1:
131 psiconv_warn(lev+1,off,"Reading of Sheet Column Reference failed");
132 if (length)
133 *length = 0;
134 if (status)
135 *status = res?res:-PSICONV_E_NOMEM;
136 return result;
137}
138
139static psiconv_sheet_cell_block_t
140 psiconv_read_var_cellblock (const psiconv_buffer buf, int lev,
141 psiconv_u32 off, int *length,
142 int *status)
143{
144 int len=0;
145 int res;
146 psiconv_sheet_cell_block_t result;
147 psiconv_u32 temp;
148
149 psiconv_progress(lev+1,off+len,"Going to read a sheet cell block reference");
150 psiconv_progress(lev+2,off+len,
151 "Going to read the initial byte (%02x expected)",0x00);
152 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
153 if (res)
154 goto ERROR1;
155 if (temp != 0x00) {
156 psiconv_warn(lev+2,off+len,
157 "Sheet cell reference initial byte unknown value (ignored)");
158 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp);
159 }
160 len ++;
161
162 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
163 if (res)
164 goto ERROR1;
165 if (temp & 0xffff0000) {
166 psiconv_warn(lev+2,off+len,
167 "Sheet block initial row reference to unknown row (reset)");
168 }
169 result.first.row.offset = temp;
170 result.first.row.absolute = psiconv_bool_true;
171 len += 4;
172
173 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
174 if (res)
175 goto ERROR1;
176 if (temp & 0xffff0000) {
177 psiconv_warn(lev+2,off+len,
178 "Sheet block initial column reference to unknown row (reset)");
179 }
180 result.first.column.offset = temp;
181 result.first.column.absolute = psiconv_bool_true;
182 len += 4;
183
184 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
185 if (res)
186 goto ERROR1;
187 if (temp & 0xffff0000) {
188 psiconv_warn(lev+2,off+len,
189 "Sheet block final row reference to unknown row (reset)");
190 }
191 result.last.row.offset = temp;
192 result.last.row.absolute = psiconv_bool_true;
193 len += 4;
194
195 temp = psiconv_read_u32(buf,lev+2,off+len,&res);
196 if (res)
197 goto ERROR1;
198 if (temp & 0xffff0000) {
199 psiconv_warn(lev+2,off+len,
200 "Sheet block final column reference to unknown row (reset)");
201 }
202 result.last.column.offset = temp;
203 result.last.column.absolute = psiconv_bool_true;
204 len += 4;
205
206 if (length)
207 *length = len;
208
209 psiconv_progress(lev,off+len-1,
210 "End of sheet cell block reference (total length: %08x)",
211 len);
212 return result;
213ERROR1:
214 psiconv_warn(lev+1,off,"Reading of Sheet Cell Block Reference failed");
215 if (length)
216 *length = 0;
217 if (status)
218 *status = res?res:-PSICONV_E_NOMEM;
219 return result;
77} 220}
78 221
79int psiconv_parse_sheet_numberformat(const psiconv_buffer buf, int lev, 222int psiconv_parse_sheet_numberformat(const psiconv_buffer buf, int lev,
80 psiconv_u32 off, int *length, 223 psiconv_u32 off, int *length,
81 psiconv_sheet_numberformat result) 224 psiconv_sheet_numberformat result)
… …
311 if (res) 454 if (res)
312 goto ERROR2; 455 goto ERROR2;
313 if (temp != 0x00) { 456 if (temp != 0x00) {
314 psiconv_warn(lev+2,off+len, 457 psiconv_warn(lev+2,off+len,
315 "Sheet status section unknown byte unknown value (ignored)"); 458 "Sheet status section unknown byte unknown value (ignored)");
316 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp); 459 psiconv_debug(lev+2,off+len,"Unknown byte: %02x",temp);
317 } 460 }
318 len ++; 461 len ++;
319 462
320 psiconv_progress(lev+2,off+len,"Going to read sheet display size"); 463 psiconv_progress(lev+2,off+len,"Going to read sheet display size");
321 (*result)->sheet_display_size = psiconv_read_u32(buf,lev+2,off + len,&res); 464 (*result)->sheet_display_size = psiconv_read_u32(buf,lev+2,off + len,&res);
… …
354 497
355int psiconv_parse_sheet_workbook_section(const psiconv_buffer buf, int lev, 498int psiconv_parse_sheet_workbook_section(const psiconv_buffer buf, int lev,
356 psiconv_u32 off, int *length, 499 psiconv_u32 off, int *length,
357 psiconv_sheet_workbook_section *result) 500 psiconv_sheet_workbook_section *result)
358{ 501{
359 int res=0; 502 int res=0,with_name;
360 psiconv_u32 temp,formulas_off,worksheets_off; 503 psiconv_u32 temp,formulas_off,worksheets_off,info_off,var_off,name_off=0;
361 int len=0; 504 int len=0;
362 505
363 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");
364 if (!(*result = malloc(sizeof(**result)))) 507 if (!(*result = malloc(sizeof(**result))))
365 goto ERROR1; 508 goto ERROR1;
366 509
367 psiconv_progress(lev+2,off+len, 510 psiconv_progress(lev+2,off+len,
368 "Going to read the initial byte (%02x expected)",0x04); 511 "Going to read the initial byte (%02x or %02x expected)",
512 0x02,0x04);
369 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 513 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
370 if (res) 514 if (res)
371 goto ERROR2; 515 goto ERROR2;
372 if (temp != 0x04) { 516 if ((temp != 0x04) && temp !=0x02) {
373 psiconv_warn(lev+2,off+len, 517 psiconv_warn(lev+2,off+len,
374 "Sheet workbook section initial byte unknown value (ignored)"); 518 "Sheet workbook section initial byte unknown value (ignored)");
375 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp); 519 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp);
376 } 520 }
521 with_name = temp ==0x04;
377 len ++; 522 len ++;
378 523
379 psiconv_progress(lev+2,off+len, 524 psiconv_progress(lev+2,off+len,
380 "Going to read the offset of the 1st ??? Section"); 525 "Going to read the offset of the sheet info Section");
381 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 526 info_off = psiconv_read_u32(buf,lev+2,off+len,&res);
382 if (res) 527 if (res)
383 goto ERROR2; 528 goto ERROR2;
384 psiconv_debug(lev+2,off+len,"Offset: %04x",temp); 529 psiconv_debug(lev+2,off+len,"Offset: %04x",info_off);
385 len += 4; 530 len += 4;
386 531
387 psiconv_progress(lev+2,off+len, 532 psiconv_progress(lev+2,off+len,
388 "Going to read the offset of the Formulas List"); 533 "Going to read the offset of the Formulas List");
389 formulas_off = psiconv_read_u32(buf,lev+2,off+len,&res); 534 formulas_off = psiconv_read_u32(buf,lev+2,off+len,&res);
… …
399 goto ERROR2; 544 goto ERROR2;
400 psiconv_debug(lev+2,off+len,"Offset: %04x",worksheets_off); 545 psiconv_debug(lev+2,off+len,"Offset: %04x",worksheets_off);
401 len += 4; 546 len += 4;
402 547
403 psiconv_progress(lev+2,off+len, 548 psiconv_progress(lev+2,off+len,
404 "Going to read the offset of the 4th ??? Section"); 549 "Going to read the offset of the Variable List");
405 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 550 var_off = psiconv_read_u32(buf,lev+2,off+len,&res);
406 if (res) 551 if (res)
407 goto ERROR2; 552 goto ERROR2;
408 psiconv_debug(lev+2,off+len,"Offset: %04x",temp); 553 psiconv_debug(lev+2,off+len,"Offset: %04x",var_off);
409 len += 4; 554 len += 4;
410 555
556 if (with_name) {
557 psiconv_progress(lev+2,off+len,
558 "Going to read the offset of the Name Section");
559 name_off = psiconv_read_u32(buf,lev+2,off+len,&res);
560 if (res)
561 goto ERROR2;
562 psiconv_debug(lev+2,off+len,"Offset: %04x",name_off);
563 len += 4;
564 }
565
566
567 psiconv_progress(lev+2,off+len,"Going to read the info section");
568 if ((res = psiconv_parse_sheet_info_section(buf,lev+2,info_off,NULL,
569 &(*result)->info)))
570 goto ERROR2;
571
572 psiconv_progress(lev+2,off+len,"Going to read the variables list");
573 if ((res = psiconv_parse_sheet_variable_list(buf,lev+2,var_off,NULL,
574 &(*result)->variables)))
575 goto ERROR3;
576
411 psiconv_progress(lev+2,off+len,"Going to read the formulas list"); 577 psiconv_progress(lev+2,off+len,"Going to read the formulas list");
412 if ((res = psiconv_parse_sheet_formula_table(buf,lev+2,formulas_off,NULL, 578 if ((res = psiconv_parse_sheet_formula_list(buf,lev+2,formulas_off,NULL,
413 &(*result)->formulas))) 579 &(*result)->formulas)))
414 goto ERROR2; 580 goto ERROR4;
415 581
416 psiconv_progress(lev+2,off+len,"Going to read the worksheet list"); 582 psiconv_progress(lev+2,off+len,"Going to read the worksheet list");
417 if ((res = psiconv_parse_sheet_worksheet_list(buf,lev+2,worksheets_off, 583 if ((res = psiconv_parse_sheet_worksheet_list(buf,lev+2,worksheets_off,
418 NULL,&(*result)->worksheets))) 584 NULL,&(*result)->worksheets)))
419 goto ERROR2; 585 goto ERROR5;
420 586
587 if (with_name) {
588 psiconv_progress(lev+2,off+len,"Going to read the name section");
589 if ((res = psiconv_parse_sheet_name_section(buf,lev+2,name_off,NULL,
590 &(*result)->name)))
591 goto ERROR6;
592 } else
593 (*result)->name = NULL;
421 594
422 if (length) 595 if (length)
423 *length = len; 596 *length = len;
424 597
425 psiconv_progress(lev,off+len-1, 598 psiconv_progress(lev,off+len-1,
426 "End of sheet workbook section (total length: %08x)", len); 599 "End of sheet workbook section (total length: %08x)", len);
427 return 0; 600 return 0;
428 601
602ERROR6:
603 psiconv_free_sheet_worksheet_list((*result)->worksheets);
604ERROR5:
605 psiconv_free_formula_list((*result)->formulas);
606ERROR4:
607 psiconv_free_sheet_variable_list((*result)->variables);
608ERROR3:
609 psiconv_free_sheet_info_section((*result)->info);
429ERROR2: 610ERROR2:
430 free (*result); 611 free (*result);
431ERROR1: 612ERROR1:
432 psiconv_warn(lev+1,off,"Reading of Sheet Workbook Section failed"); 613 psiconv_warn(lev+1,off,"Reading of Sheet Workbook Section failed");
433 if (length) 614 if (length)
… …
436 return -PSICONV_E_NOMEM; 617 return -PSICONV_E_NOMEM;
437 else 618 else
438 return res; 619 return res;
439} 620}
440 621
622int psiconv_parse_sheet_name_section(const psiconv_buffer buf, int lev,
623 psiconv_u32 off, int *length,
624 psiconv_sheet_name_section *result)
625{
626 int res=0;
627 psiconv_u32 temp;
628 int len=0,leng;
629
630 psiconv_progress(lev+1,off,"Going to read the sheet name section");
631 if (!(*result = malloc(sizeof(**result))))
632 goto ERROR1;
633
634 psiconv_progress(lev+2,off+len,
635 "Going to read the initial byte (%02x expected)",0x02);
636 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
637 if (res)
638 goto ERROR2;
639 if (temp != 0x02) {
640 psiconv_warn(lev+2,off+len,
641 "Sheet name section initial byte unknown value (ignored)");
642 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp);
643 }
644 len ++;
645
646 psiconv_progress(lev+2,off+len, "Going to read the sheet name");
647 (*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng,&res);
648 if (res)
649 goto ERROR2;
650 len += leng;
651
652 if (length)
653 *length = len;
654
655 psiconv_progress(lev,off+len-1,
656 "End of sheet name section (total length: %08x)", len);
657 return 0;
658
659ERROR2:
660 free(*result);
661ERROR1:
662 psiconv_warn(lev+1,off,"Reading of Sheet Name Section failed");
663 if (length)
664 *length = 0;
665 if (!res)
666 return -PSICONV_E_NOMEM;
667 else
668 return res;
669}
670
671int psiconv_parse_sheet_info_section(const psiconv_buffer buf, int lev,
672 psiconv_u32 off, int *length,
673 psiconv_sheet_info_section *result)
674{
675 int res=0;
676 psiconv_u32 temp;
677 int len=0,leng;
678
679 psiconv_progress(lev+1,off,"Going to read the sheet info section");
680 if (!(*result = malloc(sizeof(**result))))
681 goto ERROR1;
682
683 psiconv_progress(lev+2,off+len,
684 "Going to read the initial byte (%02x expected)",0x02);
685 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
686 if (res)
687 goto ERROR2;
688 if (temp != 0x02) {
689 psiconv_warn(lev+2,off+len,
690 "Sheet info section initial byte unknown value (ignored)");
691 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp);
692 }
693 len ++;
694
695 psiconv_progress(lev+2,off+len, "Going to read an unknown Xint");
696 temp = psiconv_read_X(buf,lev+2,off+len,&leng,&res);
697 if (res)
698 goto ERROR2;
699 psiconv_debug(lev+2,off+len,"Value: %d\n",temp);
700 len += leng;
701
702 psiconv_progress(lev+2,off+len, "Going to read the flags byte");
703 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
704 if (res)
705 goto ERROR2;
706 (*result)->auto_recalc = temp & 0x01 ? psiconv_bool_true:psiconv_bool_false;
707 psiconv_debug(lev+2,off+len,"Auto recalculation: %02x",
708 (*result)->auto_recalc);
709 if ((temp & 0xfe) != 0x02) {
710 psiconv_warn(lev+2,off+len,"Sheet Info Section flags byte "
711 "contains unknown flags (ignored)");
712 psiconv_debug(lev+2,off+len,"Unknown flags: %02x",temp &0xfe);
713 }
714
715 len ++;
716
717
718 if (length)
719 *length = len;
720
721 psiconv_progress(lev,off+len-1,
722 "End of sheet info section (total length: %08x)", len);
723 return 0;
724
725ERROR2:
726 free(*result);
727ERROR1:
728 psiconv_warn(lev+1,off,"Reading of Sheet Name Section failed");
729 if (length)
730 *length = 0;
731 if (!res)
732 return -PSICONV_E_NOMEM;
733 else
734 return res;
735}
736
441int psiconv_parse_sheet_formula_table(const psiconv_buffer buf, int lev, 737int psiconv_parse_sheet_formula_list(const psiconv_buffer buf, int lev,
442 psiconv_u32 off, int *length, 738 psiconv_u32 off, int *length,
443 psiconv_formula_list *result) 739 psiconv_formula_list *result)
444{ 740{
445 int res=0; 741 int res=0;
446 int len=0; 742 int len=0;
447 psiconv_u32 temp; 743 psiconv_u32 temp;
448 psiconv_formula formula; 744 psiconv_formula formula;
449 psiconv_u32 listlen,i; 745 psiconv_u32 listlen,i;
450 int leng; 746 int leng;
451 747
452 psiconv_progress(lev+1,off,"Going to read the sheet formula table"); 748 psiconv_progress(lev+1,off,"Going to read the sheet formula list");
453 if (!(*result = psiconv_list_new(sizeof(struct psiconv_formula_s)))) 749 if (!(*result = psiconv_list_new(sizeof(struct psiconv_formula_s))))
454 goto ERROR1; 750 goto ERROR1;
455 751
456 psiconv_progress(lev+2,off+len, 752 psiconv_progress(lev+2,off+len,
457 "Going to read the initial byte (%02x expected)",0x02); 753 "Going to read the initial byte (%02x expected)",0x02);
458 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 754 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
459 if (res) 755 if (res)
460 goto ERROR2; 756 goto ERROR2;
461 if (temp != 0x02) { 757 if (temp != 0x02) {
462 psiconv_warn(lev+2,off+len, 758 psiconv_warn(lev+2,off+len,
463 "Sheet formula table initial byte unknown value (ignored)"); 759 "Sheet formula list initial byte unknown value (ignored)");
464 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp); 760 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp);
465 } 761 }
466 len ++; 762 len ++;
467 763
468 psiconv_progress(lev+2,off+len, 764 psiconv_progress(lev+2,off+len,
… …
485 781
486 if (length) 782 if (length)
487 *length = len; 783 *length = len;
488 784
489 psiconv_progress(lev,off+len-1, 785 psiconv_progress(lev,off+len-1,
490 "End of sheet formula table (total length: %08x)", len); 786 "End of sheet formula list (total length: %08x)", len);
491 return 0; 787 return 0;
492 788
493ERROR3: 789ERROR3:
494 psiconv_free_formula(formula); 790 psiconv_free_formula(formula);
495ERROR2: 791ERROR2:
496 psiconv_list_free(*result); 792 psiconv_list_free(*result);
497ERROR1: 793ERROR1:
498 psiconv_warn(lev+1,off,"Reading of Sheet Formula Table failed"); 794 psiconv_warn(lev+1,off,"Reading of Sheet Formula list failed");
499 if (length) 795 if (length)
500 *length = 0; 796 *length = 0;
501 if (!res) 797 if (!res)
502 return -PSICONV_E_NOMEM; 798 return -PSICONV_E_NOMEM;
503 else 799 else
… …
1162 return -PSICONV_E_NOMEM; 1458 return -PSICONV_E_NOMEM;
1163 else 1459 else
1164 return res; 1460 return res;
1165} 1461}
1166 1462
1463int psiconv_parse_sheet_variable(const psiconv_buffer buf, int lev,
1464 psiconv_u32 off, int *length,
1465 psiconv_sheet_variable *result)
1466{
1467 int res=0;
1468 int len=0;
1469 psiconv_u32 marker;
1470 int leng;
1471
1472 psiconv_progress(lev+1,off,"Going to read a sheet variable");
1473 if (!(*result = malloc(sizeof(**result))))
1474 goto ERROR1;
1475
1476 psiconv_progress(lev+2,off+len, "Going to read the variable name");
1477 (*result)->name = psiconv_read_string(buf,lev+2,off+len,&leng,&res);
1478 if (res)
1479 goto ERROR2;
1480 len += leng;
1481
1482 psiconv_progress(lev+2,off+len,"Going to read the type marker");
1483 marker = psiconv_read_u8(buf,lev+2,off+len,&res);
1484 if (res)
1485 goto ERROR3;
1486 psiconv_debug(lev+2,off+len,"Marker: %02x",marker);
1487 len ++;
1488
1489 if (marker == 0x00) {
1490 (*result)->type = psiconv_var_int;
1491 psiconv_progress(lev+2,off+len,"Going to read a signed integer");
1492 (*result)->data.dat_int = psiconv_read_sint(buf,lev+2,off+len,&leng,&res);
1493 if (res)
1494 goto ERROR3;
1495 psiconv_debug(lev+2,off+len,"Value: %d",(*result)->data.dat_int);
1496 len += leng;
1497 } else if (marker == 0x01) {
1498 (*result)->type = psiconv_var_float;
1499 psiconv_progress(lev+2,off+len,"Going to read a floating point number");
1500 (*result)->data.dat_float = psiconv_read_float(buf,lev+2,off+len,&leng,
1501 &res);
1502 if (res)
1503 goto ERROR3;
1504 psiconv_debug(lev+2,off+len,"Value: %f",(*result)->data.dat_float);
1505 len += leng;
1506 } else if (marker == 0x02) {
1507 (*result)->type = psiconv_var_string;
1508 psiconv_progress(lev+2,off+len,"Going to read a string");
1509 (*result)->data.dat_string = psiconv_read_string(buf,lev+2,off+len,&leng,
1510 &res);
1511 if (res)
1512 goto ERROR3;
1513 len += leng;
1514 } else if (marker == 0x03) {
1515 (*result)->type = psiconv_var_cellref;
1516 psiconv_progress(lev+2,off+len,"Going to read a cell reference");
1517 (*result)->data.dat_cellref = psiconv_read_var_cellref(buf,lev+2,off+len,
1518 &leng, &res);
1519 if (res)
1520 goto ERROR3;
1521 len += leng;
1522 } else if (marker == 0x04) {
1523 (*result)->type = psiconv_var_cellblock;
1524 psiconv_progress(lev+2,off+len,"Going to read a cell block reference");
1525 (*result)->data.dat_cellblock = psiconv_read_var_cellblock(buf,lev+2,
1526 off+len,
1527 &leng, &res);
1528 if (res)
1529 goto ERROR3;
1530 len += leng;
1531 } else {
1532 psiconv_warn(lev+2,off+len,"Sheet variable unknown type marker");
1533 res = -PSICONV_E_PARSE;
1534 goto ERROR3;
1535 }
1536
1537 psiconv_progress(lev+2,off+len,"Going to read the variable number");
1538 (*result)->number = psiconv_read_u32(buf,lev+2,off+len,&res);
1539 if (res)
1540 goto ERROR4;
1541 psiconv_debug(lev+2,off+len,"Number: %08x",(*result)->number);
1542 len += 4;
1543
1544 if (length)
1545 *length = len;
1546
1547 psiconv_progress(lev,off+len-1,
1548 "End of sheet variable (total length: %08x)", len);
1549 return 0;
1550
1551ERROR4:
1552 if ((*result)->type == psiconv_var_string)
1553 free((*result)->data.dat_string);
1554ERROR3:
1555 free((*result)->name);
1556ERROR2:
1557 free (*result);
1558ERROR1:
1559 psiconv_warn(lev+1,off,"Reading of Sheet Variable failed");
1560 if (length)
1561 *length = 0;
1562 if (!res)
1563 return -PSICONV_E_NOMEM;
1564 else
1565 return res;
1566}
1567
1568
1569int psiconv_parse_sheet_variable_list(const psiconv_buffer buf, int lev,
1570 psiconv_u32 off, int *length,
1571 psiconv_sheet_variable_list *result)
1572{
1573 int res=0;
1574 int len=0;
1575 psiconv_u32 temp;
1576 psiconv_sheet_variable variable;
1577 psiconv_u32 listlen,i;
1578 int leng;
1579
1580 psiconv_progress(lev+1,off,"Going to read the sheet variable list");
1581 if (!(*result = psiconv_list_new(sizeof(struct psiconv_sheet_variable_s))))
1582 goto ERROR1;
1583
1584 psiconv_progress(lev+2,off+len,
1585 "Going to read the initial byte (%02x expected)",0x02);
1586 temp = psiconv_read_u8(buf,lev+2,off+len,&res);
1587 if (res)
1588 goto ERROR2;
1589 if (temp != 0x02) {
1590 psiconv_warn(lev+2,off+len,
1591 "Sheet variable list initial byte unknown value (ignored)");
1592 psiconv_debug(lev+2,off+len,"Initial byte: %02x",temp);
1593 }
1594 len ++;
1595
1596 psiconv_progress(lev+2,off+len,
1597 "Going to read the number of variables");
1598 listlen = psiconv_read_X(buf,lev+2,off+len,&leng,&res);
1599 if (res)
1600 goto ERROR2;
1601 psiconv_debug(lev+2,off+len,"Number of variables: %d",listlen);
1602 len += leng;
1603
1604 psiconv_progress(lev+2,off+len,"Going to read all variables");
1605 for (i = 0; i < listlen; i++) {
1606 psiconv_progress(lev+3,off+len,"Going to read variable %d",i);
1607 if ((res = psiconv_parse_sheet_variable(buf,lev+3,off+len,&leng,&variable)))
1608 goto ERROR2;
1609 if ((res = psiconv_list_add(*result,variable)))
1610 goto ERROR3;
1611 len += leng;
1612 }
1613
1614 if (length)
1615 *length = len;
1616
1617 psiconv_progress(lev,off+len-1,
1618 "End of sheet variabels list (total length: %08x)", len);
1619 return 0;
1620
1621ERROR3:
1622 psiconv_free_sheet_variable(variable);
1623ERROR2:
1624 psiconv_list_free(*result);
1625ERROR1:
1626 psiconv_warn(lev+1,off,"Reading of Sheet Variable list failed");
1627 if (length)
1628 *length = 0;
1629 if (!res)
1630 return -PSICONV_E_NOMEM;
1631 else
1632 return res;
1633}
Legend:
Removed from v.128  
changed lines
  Added in v.131
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26