Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4982) +++ trunk/doc-rnd/hacking/renames (revision 4983) @@ -631,3 +631,8 @@ fp_host_uninit -> pcb_fp_host_uninit fp_rehash -> pcb_fp_rehash ImportNetlist -> pcb_import_netlist +ParsePCB -> pcb_parse_pcb +ParseElement -> pcb_parse_element +ParseFont -> pcb_parse_font +WriteBuffer -> pcb_write_buffer +WriteElementData -> pcb_write_element_data Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4982) +++ trunk/src/buffer.c (revision 4983) @@ -200,7 +200,7 @@ pcb_board_t *newPCB = pcb_board_new(); /* new data isn't added to the undo list */ - if (!ParsePCB(newPCB, Filename, fmt, CFR_invalid)) { + if (!pcb_parse_pcb(newPCB, Filename, fmt, CFR_invalid)) { /* clear data area and replace pointer */ pcb_buffer_clear(Buffer); free(Buffer->Data); Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 4982) +++ trunk/src/font.c (revision 4983) @@ -47,7 +47,7 @@ { int res = -1; pcb_io_err_inhibit_inc(); - conf_list_foreach_path_first(res, &conf_core.rc.default_font_file, ParseFont(&pcb->Font, __path__)); + conf_list_foreach_path_first(res, &conf_core.rc.default_font_file, pcb_parse_font(&pcb->Font, __path__)); pcb_io_err_inhibit_dec(); if (res != 0) { Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4982) +++ trunk/src/obj_elem.c (revision 4983) @@ -127,7 +127,7 @@ pcb_element_t *element; pcb_buffer_clear(Buffer); - if (!ParseElement(Buffer->Data, Name)) { + if (!pcb_parse_element(Buffer->Data, Name)) { if (conf_core.editor.show_solder_side) pcb_buffer_swap(Buffer); pcb_set_buffer_bbox(Buffer); Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 4982) +++ trunk/src/plug_io.c (revision 4983) @@ -103,7 +103,7 @@ } } -int ParsePCB(pcb_board_t *Ptr, const char *Filename, const char *fmt, int load_settings) +int pcb_parse_pcb(pcb_board_t *Ptr, const char *Filename, const char *fmt, int load_settings) { int res = -1; @@ -143,7 +143,7 @@ return res; } -int ParseElement(pcb_data_t *Ptr, const char *name) +int pcb_parse_element(pcb_data_t *Ptr, const char *name) { int res = -1; @@ -154,7 +154,7 @@ return res; } -int ParseFont(pcb_font_t *Ptr, char *Filename) +int pcb_parse_font(pcb_font_t *Ptr, char *Filename) { int res = -1; HOOK_CALL(pcb_plug_io_t, plug_io_chain, parse_font, res, == 0, (self, Ptr, Filename)); @@ -217,7 +217,7 @@ } -int WriteBuffer(FILE *f, pcb_buffer_t *buff, const char *fmt) +int pcb_write_buffer(FILE *f, pcb_buffer_t *buff, const char *fmt) { int res, newfmt = 0; pcb_plug_io_t *p = find_writer(PCB_IOT_BUFFER, fmt); @@ -234,7 +234,7 @@ return res; } -int WriteElementData(FILE *f, pcb_data_t *e, const char *fmt) +int pcb_write_element_data(FILE *f, pcb_data_t *e, const char *fmt) { int res, newfmt = 0; pcb_plug_io_t *p = e->loader; @@ -315,7 +315,7 @@ } /* new data isn't added to the undo list */ - if (!ParsePCB(PCB, new_filename, fmt, settings_dest)) { + if (!pcb_parse_pcb(PCB, new_filename, fmt, settings_dest)) { RemovePCB(oldPCB); pcb_board_new_postproc(PCB, 0); @@ -747,10 +747,10 @@ { if (thePcb) { if (PCB->is_footprint) - return WriteElementData(fp, PCB->Data, fmt); + return pcb_write_element_data(fp, PCB->Data, fmt); return pcb_write_pcb(fp, old_path, new_path, fmt, emergency); } - return WriteBuffer(fp, PCB_PASTEBUFFER, fmt); + return pcb_write_buffer(fp, PCB_PASTEBUFFER, fmt); } /* --------------------------------------------------------------------------- Index: trunk/src/plug_io.h =================================================================== --- trunk/src/plug_io.h (revision 4982) +++ trunk/src/plug_io.h (revision 4983) @@ -91,11 +91,11 @@ /********** hook wrappers **********/ -int ParsePCB(pcb_board_t *Ptr, const char *Filename, const char *fmt, int load_settings); -int ParseElement(pcb_data_t *Ptr, const char *name); -int ParseFont(pcb_font_t *Ptr, char *Filename); -int WriteBuffer(FILE *f, pcb_buffer_t *buff, const char *fmt); -int WriteElementData(FILE *f, pcb_data_t *e, const char *fmt); +int pcb_parse_pcb(pcb_board_t *Ptr, const char *Filename, const char *fmt, int load_settings); +int pcb_parse_element(pcb_data_t *Ptr, const char *name); +int pcb_parse_font(pcb_font_t *Ptr, char *Filename); +int pcb_write_buffer(FILE *f, pcb_buffer_t *buff, const char *fmt); +int pcb_write_element_data(FILE *f, pcb_data_t *e, const char *fmt); /********** common function used to be part of file.[ch] and friends **********/ FILE *CheckAndOpenFile(const char *, pcb_bool, pcb_bool, pcb_bool *, pcb_bool *); Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4982) +++ trunk/src_plugins/io_kicad/write.c (revision 4983) @@ -67,7 +67,7 @@ /* WriteViaData(FP, buff->Data); */ - WriteElementData(FP, buff->Data, "kicadl"); + pcb_write_element_data(FP, buff->Data, "kicadl"); /* for (i = 0; i < max_copper_layer + 2; i++) Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4982) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4983) @@ -64,7 +64,7 @@ /* WriteViaData(FP, buff->Data); */ - WriteElementData(FP, buff->Data, "kicadl"); + pcb_write_element_data(FP, buff->Data, "kicadl"); /* for (i = 0; i < max_copper_layer + 2; i++)