--- psiconv/trunk/lib/psiconv/data.c 1999/10/03 21:10:47 2 +++ psiconv/trunk/lib/psiconv/data.c 2000/12/13 16:17:54 62 @@ -18,11 +18,10 @@ */ #include "config.h" +#include "compat.h" #include #include #include "data.h" -#include "list.h" -#include "general.h" static psiconv_color clone_color(psiconv_color color); static psiconv_font clone_font(psiconv_font font); @@ -32,22 +31,30 @@ static void psiconv_free_style_aux(void *style); static void psiconv_free_in_line_layout_aux(void * layout); static void psiconv_free_paragraph_aux(void * paragraph); +static void psiconv_free_paint_data_section_aux(void * section); +static void psiconv_free_clipart_section_aux(void * section); psiconv_character_layout psiconv_basic_character_layout(void) { - struct psiconv_color black = + /* Make the structures static, to oblige IRIX */ + static struct psiconv_color_s black = { 0x00, /* red */ 0x00, /* green */ 0x00, /* blue */ }; - struct psiconv_color white = + static struct psiconv_color_s white = { 0xff, /* red */ 0xff, /* green */ 0xff, /* blue */ }; - struct psiconv_character_layout cl = + static struct psiconv_font_s font = + { + "Times New Roman", /* name */ + 3 /* screenfont */ + }; + struct psiconv_character_layout_s cl = { &black, /* color */ &white, /* back_color */ @@ -57,51 +64,38 @@ psiconv_normalscript, /* super_sub */ psiconv_bool_false, /* underline */ psiconv_bool_false, /* strike_out */ - NULL, /* font */ + &font, /* font */ }; - cl.color = malloc(sizeof(*cl.color)); - cl.color->red = 0x00; - cl.color->green = 0x00; - cl.color->blue = 0x00; - cl.back_color = malloc(sizeof(*cl.color)); - cl.back_color->red = 0xff; - cl.back_color->green = 0xff; - cl.back_color->blue = 0xff; - cl.font = malloc(sizeof(*cl.font)); - cl.font->name = strdup("Times New Roman"); - cl.font->screenfont = 3; return psiconv_clone_character_layout(&cl); } psiconv_paragraph_layout psiconv_basic_paragraph_layout(void) { - char base_font[] = "Times New Roman"; - - struct psiconv_font font = + static struct psiconv_font_s font = { - base_font, /* name */ + "Times New Roman", /* name */ 2 /* screenfont */ }; - struct psiconv_color black = + static struct psiconv_color_s black = { 0x00, /* red */ 0x00, /* green */ 0x00, /* blue */ }; - struct psiconv_color white = + static struct psiconv_color_s white = { 0xff, /* red */ 0xff, /* green */ 0xff, /* blue */ }; - struct psiconv_border no_border = + static struct psiconv_border_s no_border = { psiconv_border_none, /* kind */ 1, /* thickness */ &black /* color */ }; - struct psiconv_bullet bullet = + static struct psiconv_bullet_s bullet = { psiconv_bool_false, /* on */ 10.0, /* font_size */ @@ -110,12 +104,12 @@ &black, /* color */ &font, /* font */ }; - struct psiconv_all_tabs tabs = + static struct psiconv_all_tabs_s tabs = { 0.64, /* normal */ NULL /* kind */ }; - struct psiconv_paragraph_layout pl = + struct psiconv_paragraph_layout_s pl = { &white, /* back_color */ 0.0, /* indent_left */ @@ -141,7 +135,8 @@ }; psiconv_paragraph_layout res; - pl.tabs->extras = psiconv_list_new(sizeof(struct psiconv_tab)); + if (!(pl.tabs->extras = psiconv_list_new(sizeof(struct psiconv_tab_s)))) + return NULL; res = psiconv_clone_paragraph_layout(&pl); psiconv_list_free(pl.tabs->extras); return res; @@ -150,7 +145,8 @@ psiconv_color clone_color(psiconv_color color) { psiconv_color result; - result = malloc(sizeof(*result)); + if (!(result = malloc(sizeof(*result)))) + return NULL; *result = *color; return result; } @@ -158,38 +154,65 @@ psiconv_font clone_font(psiconv_font font) { psiconv_font result; - result = malloc(sizeof(*result)); + if(!(result = malloc(sizeof(*result)))) + goto ERROR1; *result = *font; - result->name = strdup(result->name); + if (!(result->name = strdup(result->name))) + goto ERROR2; return result; +ERROR2: + free(result); +ERROR1: + return NULL; } psiconv_border clone_border(psiconv_border border) { psiconv_border result; - result = malloc(sizeof(*result)); + if (!(result = malloc(sizeof(*result)))) + goto ERROR1; *result = *border; - result->color = clone_color(result->color); + if(!(result->color = clone_color(result->color))) + goto ERROR2; return result; +ERROR2: + free(result); +ERROR1: + return NULL; } psiconv_bullet clone_bullet(psiconv_bullet bullet) { psiconv_bullet result; - result = malloc(sizeof(*result)); + if (!(result = malloc(sizeof(*result)))) + goto ERROR1; *result = *bullet; - result->font = clone_font(result->font); - result->color = clone_color(result->color); + if (!(result->font = clone_font(result->font))) + goto ERROR2; + if (!(result->color = clone_color(result->color))) + goto ERROR3; return result; +ERROR3: + psiconv_free_font(result->font); +ERROR2: + free(result); +ERROR1: + return NULL; } psiconv_all_tabs clone_all_tabs(psiconv_all_tabs all_tabs) { psiconv_all_tabs result; - result = malloc(sizeof(*result)); + if (!(result = malloc(sizeof(*result)))) + goto ERROR1; *result = *all_tabs; - result->extras = psiconv_list_clone(result->extras); + if (!(result->extras = psiconv_list_clone(result->extras))) + goto ERROR2; return result; +ERROR2: + free(result); +ERROR1: + return NULL; } psiconv_character_layout psiconv_clone_character_layout @@ -197,12 +220,24 @@ { psiconv_character_layout result; - result = malloc(sizeof(*result)); + if (!(result = malloc(sizeof(*result)))) + goto ERROR1; *result = *ls; - result->color = clone_color(result->color); - result->back_color = clone_color(result->back_color); - result->font = clone_font(result->font); + if (!(result->color = clone_color(result->color))) + goto ERROR2; + if (!(result->back_color = clone_color(result->back_color))) + goto ERROR3; + if (!(result->font = clone_font(result->font))) + goto ERROR4; return result; +ERROR4: + psiconv_free_color(result->back_color); +ERROR3: + psiconv_free_color(result->color); +ERROR2: + free(result); +ERROR1: + return NULL; } psiconv_paragraph_layout psiconv_clone_paragraph_layout @@ -210,16 +245,40 @@ { psiconv_paragraph_layout result; - result = malloc(sizeof(*result)); + if (!(result = malloc(sizeof(*result)))) + goto ERROR1; *result = *ls; - result->back_color = clone_color(result->back_color); - result->bullet = clone_bullet(result->bullet); - result->left_border = clone_border(result->left_border); - result->right_border = clone_border(result->right_border); - result->top_border = clone_border(result->top_border); - result->bottom_border = clone_border(result->bottom_border); - result->tabs = clone_all_tabs(result->tabs); + if (!(result->back_color = clone_color(result->back_color))) + goto ERROR2; + if (!(result->bullet = clone_bullet(result->bullet))) + goto ERROR3; + if (!(result->left_border = clone_border(result->left_border))) + goto ERROR4; + if (!(result->right_border = clone_border(result->right_border))) + goto ERROR5; + if (!(result->top_border = clone_border(result->top_border))) + goto ERROR6; + if (!(result->bottom_border = clone_border(result->bottom_border))) + goto ERROR7; + if (!(result->tabs = clone_all_tabs(result->tabs))) + goto ERROR8; return result; +ERROR8: + psiconv_free_border(result->bottom_border); +ERROR7: + psiconv_free_border(result->top_border); +ERROR6: + psiconv_free_border(result->right_border); +ERROR5: + psiconv_free_border(result->left_border); +ERROR4: + psiconv_free_bullet(result->bullet); +ERROR3: + psiconv_free_color(result->back_color); +ERROR2: + free(result); +ERROR1: + return NULL; } psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr) @@ -455,11 +514,110 @@ } } +void psiconv_free_texted_f(psiconv_texted_f file) +{ + if (file) { + psiconv_free_page_layout_section(file->page_sec); + psiconv_free_texted_section(file->texted_sec); + free(file); + } +} + +void psiconv_free_paint_data_section_aux(void * section) +{ + if (((psiconv_paint_data_section) section)->red) + free(((psiconv_paint_data_section)section) -> red); + if (((psiconv_paint_data_section) section)->green) + free(((psiconv_paint_data_section)section) -> green); + if (((psiconv_paint_data_section) section)->blue) + free(((psiconv_paint_data_section)section) -> blue); +} + +void psiconv_free_paint_data_section(psiconv_paint_data_section section) +{ + if (section) { + psiconv_free_paint_data_section_aux(section); + free(section); + } +} + +void psiconv_free_pictures(psiconv_pictures section) +{ + if (section) + psiconv_list_free_el(section,&psiconv_free_paint_data_section_aux); +} + +void psiconv_free_jumptable_section (psiconv_jumptable_section section) +{ + if (section) + psiconv_list_free(section); +} + +void psiconv_free_mbm_f(psiconv_mbm_f file) +{ + if (file) { + psiconv_free_pictures(file->sections); + free(file); + } +} + +void psiconv_free_sketch_section(psiconv_sketch_section sec) +{ + if (sec) { + psiconv_free_paint_data_section(sec->picture); + free(sec); + } +} + +void psiconv_free_sketch_f(psiconv_sketch_f file) +{ + if (file) { + psiconv_free_sketch_section(file->sketch_sec); + free(file); + } +} + +void psiconv_free_clipart_section_aux(void *section) +{ + if (section) + free(((psiconv_clipart_section ) section)->picture); +} + +void psiconv_free_clipart_section(psiconv_clipart_section section) +{ + if (section) { + psiconv_free_clipart_section_aux(section); + free(section); + } +} + +void psiconv_free_cliparts(psiconv_cliparts section) +{ + if (section) + psiconv_list_free_el(section,&psiconv_free_clipart_section_aux); +} + +void psiconv_free_clipart_f(psiconv_clipart_f file) +{ + if (file) { + psiconv_free_cliparts(file->sections); + free(file); + } +} + void psiconv_free_file(psiconv_file file) { if (file) { if (file->type == psiconv_word_file) psiconv_free_word_f((psiconv_word_f) file->file); + else if (file->type == psiconv_texted_file) + psiconv_free_texted_f((psiconv_texted_f) file->file); + else if (file->type == psiconv_mbm_file) + psiconv_free_mbm_f((psiconv_mbm_f) file->file); + else if (file->type == psiconv_sketch_file) + psiconv_free_sketch_f((psiconv_sketch_f) file->file); + else if (file->type == psiconv_clipart_file) + psiconv_free_clipart_f((psiconv_clipart_f) file->file); free(file); } }