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

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

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

Revision 25 Revision 41
44 (*result) = malloc(sizeof(**result)); 44 (*result) = malloc(sizeof(**result));
45 45
46 psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3"); 46 psiconv_progress(lev+2,off+len,"Going to read UID1 to UID3");
47 (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len); 47 (*result)->uid1 = psiconv_read_u32(buf,lev+2,off+len);
48 psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1); 48 psiconv_debug(lev+2,off+len,"UID1: %08x",(*result)->uid1);
49 if ((*result)->uid1 == PSICONV_ID_CLIPART) {
50 /* That's all folks... */
51 (*result)->file = psiconv_clipart_file;
52 (*result)->uid2 = 0;
53 (*result)->uid3 = 0;
54 (*result)->checksum = 0;
55 len += 4;
56 goto DONE;
57 }
49 if ((*result)->uid1 != PSICONV_ID_PSION5) { 58 if ((*result)->uid1 != PSICONV_ID_PSION5) {
50 psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably " 59 psiconv_warn(lev+2,off+len,"UID1 has unknown value. This is probably "
51 "not a (parsable) Psion 5 file"); 60 "not a (parsable) Psion 5 file");
52 res = -1; 61 res = -1;
53 } 62 }
95 psiconv_checkuid((*result)->uid1,(*result)->uid2, 104 psiconv_checkuid((*result)->uid1,(*result)->uid2,
96 (*result)->uid3),temp); 105 (*result)->uid3),temp);
97 res = -1; 106 res = -1;
98 } 107 }
99 len += 4; 108 len += 4;
100 109
110DONE:
101 if (length) 111 if (length)
102 *length = len; 112 *length = len;
103 113
104 psiconv_progress(lev+1,off+len-1, 114 psiconv_progress(lev+1,off+len-1,
105 "End of Header Section (total length: %08x)",len); 115 "End of Header Section (total length: %08x)",len);

Legend:
Removed from v.25  
changed lines
  Added in v.41

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26