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

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

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

Revision 142 Revision 196
1/* 1/*
2 generate_driver.c - Part of psiconv, a PSION 5 file formats converter 2 generate_driver.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 2000-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
27 27
28#ifdef DMALLOC 28#ifdef DMALLOC
29#include <dmalloc.h> 29#include <dmalloc.h>
30#endif 30#endif
31 31
32static psiconv_ucs2 unicode_paint[10] = { 'P','a','i','n','t','.','a','p','p',0 };
33static psiconv_ucs2 unicode_texted[11] ={ 'T','e','x','t','E','d','.','a','p','p',0 };
34static psiconv_ucs2 unicode_word[9] = { 'W','o','r','d','.','a','p','p',0 };
35
32 36
33int psiconv_write(psiconv_buffer *buf,const psiconv_file value) 37int psiconv_write(const psiconv_config config, psiconv_buffer *buf,
38 const psiconv_file value)
34{ 39{
35 int res; 40 int res;
41 int lev = 0;
36 42
37 if (!value) { 43 if (!value) {
38 psiconv_warn(0,0,"Can't parse to an empty buffer!"); 44 psiconv_error(config,0,0,"Can't parse to an empty buffer!");
39 return -PSICONV_E_OTHER; 45 return -PSICONV_E_OTHER;
40 } 46 }
41 if (!(*buf = psiconv_buffer_new())) 47 if (!(*buf = psiconv_buffer_new()))
42 return -PSICONV_E_NOMEM; 48 return -PSICONV_E_NOMEM;
43 49
44 if (value->type == psiconv_word_file) { 50 if (value->type == psiconv_word_file) {
51 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
52 PSICONV_ID_DATA_FILE,
53 PSICONV_ID_WORD)))
54 goto ERROR;
45 if ((res =psiconv_write_word_file(*buf,(psiconv_word_f) (value->file)))) 55 if ((res =psiconv_write_word_file(config,*buf,lev+1,(psiconv_word_f) (value->file))))
46 goto ERROR; 56 goto ERROR;
47 } else if (value->type == psiconv_texted_file) { 57 } else if (value->type == psiconv_texted_file) {
58 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
59 PSICONV_ID_DATA_FILE,
60 PSICONV_ID_TEXTED)))
61 goto ERROR;
48 if ((res =psiconv_write_texted_file(*buf, 62 if ((res =psiconv_write_texted_file(config,*buf,lev+1,
49 (psiconv_texted_f) (value->file)))) 63 (psiconv_texted_f) (value->file))))
50 goto ERROR; 64 goto ERROR;
51#if 0
52 } else if (value->type == psiconv_sketch_file) { 65 } else if (value->type == psiconv_sketch_file) {
66 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
67 PSICONV_ID_DATA_FILE,
68 PSICONV_ID_SKETCH)))
69 goto ERROR;
53 if ((res =psiconv_write_sketch_file(*buf, 70 if ((res =psiconv_write_sketch_file(config,*buf,lev+1,
54 (psiconv_sketch_f) (value->file)))) 71 (psiconv_sketch_f) (value->file))))
55 goto ERROR; 72 goto ERROR;
56 } else if (value->type == psiconv_mbm_file) { 73 } else if (value->type == psiconv_mbm_file) {
74 if ((res = psiconv_write_header_section(config,*buf,lev+1,PSICONV_ID_PSION5,
75 PSICONV_ID_MBM_FILE,
76 0x00000000)))
77 goto ERROR;
57 if ((res =psiconv_write_mbm_file(*buf, 78 if ((res =psiconv_write_mbm_file(config,*buf,lev+1,
58 (psiconv_mbm_f) (value->file)))) 79 (psiconv_mbm_f) (value->file))))
59 goto ERROR; 80 goto ERROR;
60 } else if (value->type == psiconv_clipart_file) { 81 } else if (value->type == psiconv_clipart_file) {
82 /* No complete header section, so we do it all in the below function */
61 if ((res =psiconv_write_clipart_file(*buf, 83 if ((res =psiconv_write_clipart_file(config,*buf,lev+1,
62 (psiconv_clipart_f) (value->file)))) 84 (psiconv_clipart_f) (value->file))))
63 goto ERROR; 85 goto ERROR;
64#endif
65 } else { 86 } else {
66 psiconv_warn(0,0,"Unknown or unsupported file type"); 87 psiconv_error(config,0,0,"Unknown or unsupported file type");
67 res = -PSICONV_E_GENERATE; 88 res = -PSICONV_E_GENERATE;
68 goto ERROR; 89 goto ERROR;
69 } 90 }
70 if ((res = psiconv_buffer_resolve(*buf))) 91 if ((res = psiconv_buffer_resolve(*buf)))
71 goto ERROR; 92 goto ERROR;
… …
74ERROR: 95ERROR:
75 psiconv_buffer_free(*buf); 96 psiconv_buffer_free(*buf);
76 return res; 97 return res;
77} 98}
78 99
79int psiconv_write_texted_file(psiconv_buffer buf,psiconv_texted_f value) 100int psiconv_write_texted_file(const psiconv_config config,
101 psiconv_buffer buf,int lev,psiconv_texted_f value)
80{ 102{
81 psiconv_character_layout base_char; 103 psiconv_character_layout base_char;
82 psiconv_paragraph_layout base_para; 104 psiconv_paragraph_layout base_para;
83 int res; 105 int res;
84 psiconv_section_table_section section_table; 106 psiconv_section_table_section section_table;
85 psiconv_section_table_entry entry; 107 psiconv_section_table_entry entry;
86 psiconv_u32 section_table_id; 108 psiconv_u32 section_table_id;
87 psiconv_buffer buf_texted; 109 psiconv_buffer buf_texted;
88 110
111 psiconv_progress(config,lev,0,"Writing texted file");
89 if (!value) { 112 if (!value) {
90 psiconv_warn(0,0,"Null TextEd file"); 113 psiconv_error(config,0,0,"Null TextEd file");
91 return -PSICONV_E_GENERATE; 114 return -PSICONV_E_GENERATE;
92 } 115 }
93 116
94 if (!(section_table = psiconv_list_new(sizeof(*entry)))) { 117 if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
95 res = -PSICONV_E_NOMEM; 118 res = -PSICONV_E_NOMEM;
… …
108 if (!(base_para = psiconv_basic_paragraph_layout())) { 131 if (!(base_para = psiconv_basic_paragraph_layout())) {
109 res = -PSICONV_E_NOMEM; 132 res = -PSICONV_E_NOMEM;
110 goto ERROR4; 133 goto ERROR4;
111 } 134 }
112 135
113 if ((res = psiconv_write_header_section(buf,PSICONV_ID_PSION5,
114 PSICONV_ID_DATA_FILE,
115 PSICONV_ID_TEXTED)))
116 goto ERROR5;
117
118 section_table_id = psiconv_buffer_unique_id(); 136 section_table_id = psiconv_buffer_unique_id();
119 if ((res = psiconv_write_offset(buf,section_table_id))) 137 if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
120 goto ERROR5; 138 goto ERROR5;
121 139
122 entry->id = PSICONV_ID_APPL_ID_SECTION; 140 entry->id = PSICONV_ID_APPL_ID_SECTION;
123 entry->offset = psiconv_buffer_unique_id(); 141 entry->offset = psiconv_buffer_unique_id();
124 if ((res = psiconv_list_add(section_table,entry))) 142 if ((res = psiconv_list_add(section_table,entry)))
125 goto ERROR5; 143 goto ERROR5;
126 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 144 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
127 goto ERROR5; 145 goto ERROR5;
128 if ((res=psiconv_write_application_id_section(buf, 146 if ((res=psiconv_write_application_id_section(config,buf,lev+1,
129 PSICONV_ID_TEXTED,"TextEd.app"))) 147 PSICONV_ID_TEXTED,unicode_texted)))
130 goto ERROR5; 148 goto ERROR5;
131 149
132 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION; 150 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION;
133 entry->offset = psiconv_buffer_unique_id(); 151 entry->offset = psiconv_buffer_unique_id();
134 if ((res = psiconv_list_add(section_table,entry))) 152 if ((res = psiconv_list_add(section_table,entry)))
135 goto ERROR5; 153 goto ERROR5;
136 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 154 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
137 goto ERROR5; 155 goto ERROR5;
138 if ((res = psiconv_write_page_layout_section(buf,value->page_sec))) 156 if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec)))
139 goto ERROR5; 157 goto ERROR5;
140 158
141 entry->id = PSICONV_ID_TEXTED; 159 entry->id = PSICONV_ID_TEXTED;
142 entry->offset = psiconv_buffer_unique_id(); 160 entry->offset = psiconv_buffer_unique_id();
143 if ((res = psiconv_list_add(section_table,entry))) 161 if ((res = psiconv_list_add(section_table,entry)))
144 goto ERROR5; 162 goto ERROR5;
145 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 163 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
146 goto ERROR5; 164 goto ERROR5;
147 if ((res = psiconv_write_texted_section(buf,value->texted_sec, 165 if ((res = psiconv_write_texted_section(config,buf,lev+1,value->texted_sec,
148 base_char,base_para,&buf_texted))) 166 base_char,base_para,&buf_texted)))
149 goto ERROR5; 167 goto ERROR5;
150 168
151 if ((res = psiconv_buffer_concat(buf,buf_texted))) 169 if ((res = psiconv_buffer_concat(buf,buf_texted)))
152 goto ERROR6; 170 goto ERROR6;
153 171
154 172
155 if ((res = psiconv_buffer_add_target(buf,section_table_id))) 173 if ((res = psiconv_buffer_add_target(buf,section_table_id)))
156 goto ERROR6; 174 goto ERROR6;
157 175
158 res = psiconv_write_section_table_section(buf,section_table); 176 res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
159 177
160ERROR6: 178ERROR6:
161 psiconv_buffer_free(buf_texted); 179 psiconv_buffer_free(buf_texted);
162ERROR5: 180ERROR5:
163 psiconv_free_paragraph_layout(base_para); 181 psiconv_free_paragraph_layout(base_para);
… …
169 psiconv_list_free(section_table); 187 psiconv_list_free(section_table);
170ERROR1: 188ERROR1:
171 return res; 189 return res;
172} 190}
173 191
174int psiconv_write_word_file(psiconv_buffer buf,psiconv_word_f value) 192int psiconv_write_word_file(const psiconv_config config,
193 psiconv_buffer buf,int lev,psiconv_word_f value)
175{ 194{
176 int res; 195 int res;
177 psiconv_section_table_section section_table; 196 psiconv_section_table_section section_table;
178 psiconv_section_table_entry entry; 197 psiconv_section_table_entry entry;
179 psiconv_u32 section_table_id; 198 psiconv_u32 section_table_id;
180 199
200 psiconv_progress(config,lev,0,"Writing word file");
181 if (!value) { 201 if (!value) {
182 psiconv_warn(0,0,"Null Word file"); 202 psiconv_error(config,0,0,"Null Word file");
183 return -PSICONV_E_GENERATE; 203 return -PSICONV_E_GENERATE;
184 } 204 }
185 205
186 if (!(section_table = psiconv_list_new(sizeof(*entry)))) { 206 if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
187 res = -PSICONV_E_NOMEM; 207 res = -PSICONV_E_NOMEM;
… …
191 if (!(entry = malloc(sizeof(*entry)))) { 211 if (!(entry = malloc(sizeof(*entry)))) {
192 res = -PSICONV_E_NOMEM; 212 res = -PSICONV_E_NOMEM;
193 goto ERROR2; 213 goto ERROR2;
194 } 214 }
195 215
196 if ((res = psiconv_write_header_section(buf,PSICONV_ID_PSION5,
197 PSICONV_ID_DATA_FILE,
198 PSICONV_ID_WORD)))
199 goto ERROR3;
200
201 section_table_id = psiconv_buffer_unique_id(); 216 section_table_id = psiconv_buffer_unique_id();
202 if ((res = psiconv_write_offset(buf,section_table_id))) 217 if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
203 goto ERROR3; 218 goto ERROR3;
204 219
205 entry->id = PSICONV_ID_APPL_ID_SECTION; 220 entry->id = PSICONV_ID_APPL_ID_SECTION;
206 entry->offset = psiconv_buffer_unique_id(); 221 entry->offset = psiconv_buffer_unique_id();
207 if ((res = psiconv_list_add(section_table,entry))) 222 if ((res = psiconv_list_add(section_table,entry)))
208 goto ERROR3; 223 goto ERROR3;
209 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 224 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
210 goto ERROR3; 225 goto ERROR3;
211 if ((res=psiconv_write_application_id_section(buf, 226 if ((res=psiconv_write_application_id_section(config,buf,lev+1,
212 PSICONV_ID_WORD,"Word.app"))) 227 PSICONV_ID_WORD,unicode_word)))
213 goto ERROR3; 228 goto ERROR3;
214 229
215 entry->id = PSICONV_ID_WORD_STATUS_SECTION; 230 entry->id = PSICONV_ID_WORD_STATUS_SECTION;
216 entry->offset = psiconv_buffer_unique_id(); 231 entry->offset = psiconv_buffer_unique_id();
217 if ((res = psiconv_list_add(section_table,entry))) 232 if ((res = psiconv_list_add(section_table,entry)))
218 goto ERROR3; 233 goto ERROR3;
219 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 234 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
220 goto ERROR3; 235 goto ERROR3;
221 if ((res = psiconv_write_word_status_section(buf,value->status_sec))) 236 if ((res = psiconv_write_word_status_section(config,buf,lev+1,value->status_sec)))
222 goto ERROR3; 237 goto ERROR3;
223 238
224 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION; 239 entry->id = PSICONV_ID_PAGE_LAYOUT_SECTION;
225 entry->offset = psiconv_buffer_unique_id(); 240 entry->offset = psiconv_buffer_unique_id();
226 if ((res = psiconv_list_add(section_table,entry))) 241 if ((res = psiconv_list_add(section_table,entry)))
227 goto ERROR3; 242 goto ERROR3;
228 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 243 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
229 goto ERROR3; 244 goto ERROR3;
230 if ((res = psiconv_write_page_layout_section(buf,value->page_sec))) 245 if ((res = psiconv_write_page_layout_section(config,buf,lev+1,value->page_sec)))
231 goto ERROR3; 246 goto ERROR3;
232 247
233 entry->id = PSICONV_ID_WORD_STYLES_SECTION; 248 entry->id = PSICONV_ID_WORD_STYLES_SECTION;
234 entry->offset = psiconv_buffer_unique_id(); 249 entry->offset = psiconv_buffer_unique_id();
235 if ((res = psiconv_list_add(section_table,entry))) 250 if ((res = psiconv_list_add(section_table,entry)))
236 goto ERROR3; 251 goto ERROR3;
237 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 252 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
238 goto ERROR3; 253 goto ERROR3;
239 if ((res = psiconv_write_word_styles_section(buf,value->styles_sec))) 254 if ((res = psiconv_write_word_styles_section(config,buf,lev+1,value->styles_sec)))
240 goto ERROR3; 255 goto ERROR3;
241 256
242 entry->id = PSICONV_ID_TEXT_SECTION; 257 entry->id = PSICONV_ID_TEXT_SECTION;
243 entry->offset = psiconv_buffer_unique_id(); 258 entry->offset = psiconv_buffer_unique_id();
244 if ((res = psiconv_list_add(section_table,entry))) 259 if ((res = psiconv_list_add(section_table,entry)))
245 goto ERROR3; 260 goto ERROR3;
246 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 261 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
247 goto ERROR3; 262 goto ERROR3;
248 if ((res = psiconv_write_text_section(buf,value->paragraphs))) 263 if ((res = psiconv_write_text_section(config,buf,lev+1,value->paragraphs)))
249 goto ERROR3; 264 goto ERROR3;
250 265
251 entry->id = PSICONV_ID_LAYOUT_SECTION; 266 entry->id = PSICONV_ID_LAYOUT_SECTION;
252 entry->offset = psiconv_buffer_unique_id(); 267 entry->offset = psiconv_buffer_unique_id();
253 if ((res = psiconv_list_add(section_table,entry))) 268 if ((res = psiconv_list_add(section_table,entry)))
254 goto ERROR3; 269 goto ERROR3;
255 if ((res = psiconv_buffer_add_target(buf,entry->offset))) 270 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
256 goto ERROR3; 271 goto ERROR3;
257 if ((res = psiconv_write_styled_layout_section(buf,value->paragraphs, 272 if ((res = psiconv_write_styled_layout_section(config,buf,lev+1,value->paragraphs,
258 value->styles_sec))) 273 value->styles_sec)))
259 goto ERROR3; 274 goto ERROR3;
260 275
261 if ((res = psiconv_buffer_add_target(buf,section_table_id))) 276 if ((res = psiconv_buffer_add_target(buf,section_table_id)))
262 goto ERROR3; 277 goto ERROR3;
263 278
264 res = psiconv_write_section_table_section(buf,section_table); 279 res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
265 280
266ERROR3: 281ERROR3:
267 free(entry); 282 free(entry);
268ERROR2: 283ERROR2:
269 psiconv_list_free(section_table); 284 psiconv_list_free(section_table);
270ERROR1: 285ERROR1:
271 return res; 286 return res;
272} 287}
288
289int psiconv_write_sketch_file(const psiconv_config config,
290 psiconv_buffer buf,int lev,psiconv_sketch_f value)
291{
292 int res;
293 psiconv_section_table_section section_table;
294 psiconv_section_table_entry entry;
295 psiconv_u32 section_table_id;
296
297 psiconv_progress(config,lev,0,"Writing sketch file");
298 if (!value) {
299 psiconv_error(config,0,0,"Null Sketch file");
300 return -PSICONV_E_GENERATE;
301 }
302
303 if (!(section_table = psiconv_list_new(sizeof(*entry)))) {
304 res = -PSICONV_E_NOMEM;
305 goto ERROR1;
306 }
307
308 if (!(entry = malloc(sizeof(*entry)))) {
309 res = -PSICONV_E_NOMEM;
310 goto ERROR2;
311 }
312
313 section_table_id = psiconv_buffer_unique_id();
314 if ((res = psiconv_write_offset(config,buf,lev+1,section_table_id)))
315 goto ERROR3;
316
317 entry->id = PSICONV_ID_APPL_ID_SECTION;
318 entry->offset = psiconv_buffer_unique_id();
319 if ((res = psiconv_list_add(section_table,entry)))
320 goto ERROR3;
321 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
322 goto ERROR3;
323 if ((res=psiconv_write_application_id_section(config,buf,lev+1,
324 PSICONV_ID_SKETCH,unicode_paint)))
325 goto ERROR3;
326
327 entry->id = PSICONV_ID_SKETCH_SECTION;
328 entry->offset = psiconv_buffer_unique_id();
329 if ((res = psiconv_list_add(section_table,entry)))
330 goto ERROR3;
331 if ((res = psiconv_buffer_add_target(buf,entry->offset)))
332 goto ERROR3;
333 if ((res = psiconv_write_sketch_section(config,buf,lev+1,value->sketch_sec)))
334 goto ERROR3;
335
336 if ((res = psiconv_buffer_add_target(buf,section_table_id)))
337 goto ERROR3;
338 res = psiconv_write_section_table_section(config,buf,lev+1,section_table);
339
340ERROR3:
341 free(entry);
342ERROR2:
343 psiconv_list_free(section_table);
344ERROR1:
345 return res;
346}
347
348int psiconv_write_mbm_file(const psiconv_config config,
349 psiconv_buffer buf,int lev,psiconv_mbm_f value)
350{
351 int res,i;
352 psiconv_jumptable_section jumptable;
353 psiconv_u32 *entry,id,table_id;
354 psiconv_paint_data_section section;
355
356 psiconv_progress(config,lev,0,"Writing mbm file");
357 if (!value) {
358 psiconv_error(config,0,0,"Null MBM file");
359 return -PSICONV_E_GENERATE;
360 }
361
362 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) {
363 res = -PSICONV_E_NOMEM;
364 goto ERROR1;
365 }
366
367 table_id = psiconv_buffer_unique_id();
368 if ((res = psiconv_buffer_add_reference(buf,table_id)))
369 goto ERROR2;
370
371 for (i = 0; i < psiconv_list_length(value->sections); i++) {
372 if (!(section = psiconv_list_get(value->sections,i))) {
373 psiconv_error(config,0,0,"Massive memory corruption");
374 res = -PSICONV_E_NOMEM;
375 goto ERROR2;
376 }
377 id = psiconv_buffer_unique_id();
378 psiconv_list_add(jumptable,&id);
379 if ((res = psiconv_buffer_add_target(buf,id)))
380 goto ERROR2;
381 if ((res = psiconv_write_paint_data_section(config,buf,lev+1,section,0)))
382 goto ERROR2;
383 }
384
385 if ((res = psiconv_buffer_add_target(buf,table_id)))
386 goto ERROR2;
387 if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable)))
388 goto ERROR2;
389
390
391ERROR2:
392 psiconv_list_free(jumptable);
393ERROR1:
394 return res;
395}
396
397/* Note: this file is special, because it does not have a complete header! */
398int psiconv_write_clipart_file(const psiconv_config config,
399 psiconv_buffer buf,int lev,psiconv_clipart_f value)
400{
401 int res,i;
402 psiconv_jumptable_section jumptable;
403 psiconv_u32 *entry,id;
404 psiconv_clipart_section section;
405 psiconv_buffer sec_buf;
406
407 psiconv_progress(config,lev,0,"Writing clipart file");
408 if (!value) {
409 psiconv_error(config,0,0,"Null Clipart file");
410 return -PSICONV_E_GENERATE;
411 }
412
413 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) {
414 res = -PSICONV_E_NOMEM;
415 goto ERROR1;
416 }
417
418 if (!(sec_buf = psiconv_buffer_new())) {
419 res = -PSICONV_E_NOMEM;
420 goto ERROR2;
421 }
422
423 if ((res = psiconv_write_u32(config,buf,lev+1,PSICONV_ID_CLIPART)))
424 goto ERROR3;
425
426 for (i = 0; i < psiconv_list_length(value->sections); i++) {
427 if (!(section = psiconv_list_get(value->sections,i))) {
428 psiconv_error(config,0,0,"Massive memory corruption");
429 res = -PSICONV_E_NOMEM;
430 goto ERROR3;
431 }
432 id = psiconv_buffer_unique_id();
433 psiconv_list_add(jumptable,&id);
434 if ((res = psiconv_buffer_add_target(sec_buf,id)))
435 goto ERROR3;
436 if ((res = psiconv_write_clipart_section(config,sec_buf, lev+1,section)))
437 goto ERROR3;
438 }
439
440 if ((res = psiconv_write_jumptable_section(config,buf,lev+1,jumptable)))
441 goto ERROR3;
442
443 if ((res = psiconv_buffer_concat(buf,sec_buf)))
444 goto ERROR3;
445
446
447ERROR3:
448 psiconv_buffer_free(sec_buf);
449ERROR2:
450 psiconv_list_free(jumptable);
451ERROR1:
452 return res;
453}
Legend:
Removed from v.142  
changed lines
  Added in v.196
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26