Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4919) +++ trunk/doc-rnd/hacking/renames (revision 4920) @@ -477,3 +477,6 @@ FreeNetMemory -> pcb_net_free NETLIST_LOOP -> PCB_NETLIST_LOOP NET_LOOP -> PCB_NET_LOOP +GetArcMemory -> pcb_arc_new +GetElementArcMemory -> pcb_element_arc_new +RemoveFreeArc -> pcb_arc_free Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 4919) +++ trunk/src/data.c (revision 4920) @@ -217,7 +217,7 @@ END_LOOP; list_map0(&layer->Line, pcb_line_t, RemoveFreeLine); - list_map0(&layer->Arc, pcb_arc_t, RemoveFreeArc); + list_map0(&layer->Arc, pcb_arc_t, pcb_arc_free); list_map0(&layer->Text, pcb_text_t, RemoveFreeText); POLYGON_LOOP(layer); { Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 4919) +++ trunk/src/obj_arc.c (revision 4920) @@ -45,7 +45,7 @@ #include "obj_arc_draw.h" -pcb_arc_t *GetArcMemory(pcb_layer_t * layer) +pcb_arc_t *pcb_arc_new(pcb_layer_t * layer) { pcb_arc_t *new_obj; @@ -55,7 +55,7 @@ return new_obj; } -pcb_arc_t *GetElementArcMemory(pcb_element_t *Element) +pcb_arc_t *pcb_element_arc_new(pcb_element_t *Element) { pcb_arc_t *arc = calloc(sizeof(pcb_arc_t), 1); @@ -183,7 +183,7 @@ return (NULL); /* prevent stacked arcs */ } END_LOOP; - Arc = GetArcMemory(Layer); + Arc = pcb_arc_new(Layer); if (!Arc) return (Arc); @@ -211,7 +211,7 @@ -void RemoveFreeArc(pcb_arc_t * data) +void pcb_arc_free(pcb_arc_t * data) { arclist_remove(data); free(data); @@ -493,7 +493,7 @@ { r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); - RemoveFreeArc(Arc); + pcb_arc_free(Arc); return NULL; } Index: trunk/src/obj_arc.h =================================================================== --- trunk/src/obj_arc.h (revision 4919) +++ trunk/src/obj_arc.h (revision 4920) @@ -42,9 +42,9 @@ /*** Memory ***/ -pcb_arc_t *GetArcMemory(pcb_layer_t *); -pcb_arc_t *GetElementArcMemory(pcb_element_t *Element); -void RemoveFreeArc(pcb_arc_t *data); +pcb_arc_t *pcb_arc_new(pcb_layer_t *); +pcb_arc_t *pcb_element_arc_new(pcb_element_t *Element); +void pcb_arc_free(pcb_arc_t *data); /*** Utility ***/ void SetArcBoundingBox(pcb_arc_t *Arc); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4919) +++ trunk/src/obj_elem.c (revision 4920) @@ -102,7 +102,7 @@ list_map0(&element->Pin, pcb_pin_t, RemoveFreePin); list_map0(&element->Pad, pcb_pad_t, RemoveFreePad); list_map0(&element->Line, pcb_line_t, RemoveFreeLine); - list_map0(&element->Arc, pcb_arc_t, RemoveFreeArc); + list_map0(&element->Arc, pcb_arc_t, pcb_arc_free); pcb_attribute_free(&element->Attributes); reset_obj_mem(pcb_element_t, element); @@ -598,7 +598,7 @@ pcb_arc_t *CreateNewArcInElement(pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, pcb_coord_t Width, pcb_coord_t Height, pcb_angle_t angle, pcb_angle_t delta, pcb_coord_t Thickness) { - pcb_arc_t *arc = GetElementArcMemory(Element); + pcb_arc_t *arc = pcb_element_arc_new(Element); /* set Delta (0,360], StartAngle in [0,360) */ if (delta < 0) { Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4919) +++ trunk/src_plugins/io_lihata/read.c (revision 4920) @@ -409,9 +409,9 @@ pcb_arc_t *arc; if (ly != NULL) - arc = GetArcMemory(ly); + arc = pcb_arc_new(ly); else if (el != NULL) - arc = GetElementArcMemory(el); + arc = pcb_element_arc_new(el); else return -1;