Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 20183) +++ trunk/src/obj_subc.c (revision 20184) @@ -125,12 +125,6 @@ free(sc); } - -void pcb_add_subc_to_data(pcb_data_t *dt, pcb_subc_t *sc) -{ - pcb_subc_reg(dt, sc); -} - /* Create (and append) a new bound layer to a subc */ static pcb_layer_t *pcb_subc_layer_create_buff(pcb_subc_t *sc, pcb_layer_t *src) { @@ -405,7 +399,7 @@ vtp0_init(&paste_pads); sc = pcb_subc_alloc(); - pcb_add_subc_to_data(buffer->Data, sc); + pcb_subc_reg(buffer->Data, sc); /* create layer matches and copy objects */ for(n = 0; n < PCB_MAX_LAYER; n++) { Index: trunk/src/obj_subc.h =================================================================== --- trunk/src/obj_subc.h (revision 20183) +++ trunk/src/obj_subc.h (revision 20184) @@ -61,8 +61,6 @@ void pcb_subc_unreg(pcb_subc_t *subc); -void pcb_add_subc_to_data(pcb_data_t *dt, pcb_subc_t *sc); - void pcb_subc_select(pcb_board_t *pcb, pcb_subc_t *sc, pcb_change_flag_t how, int redraw); void pcb_subc_bbox(pcb_subc_t *sc); Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 20183) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 20184) @@ -325,7 +325,7 @@ set_src(&sc->Attributes, fn, lineno); nr = pcb_attribute_get(&sc->Attributes, "refdes"); htsp_set(subcs, (char *)nr, sc); - pcb_add_subc_to_data(pcb->Data, sc); + pcb_subc_reg(pcb->Data, sc); pcb_subc_bind_globals(pcb, sc); } data = sc->data; @@ -419,7 +419,7 @@ if (want_subc) { for (e = htsp_first(&subcs); e; e = htsp_next(&subcs, e)) { pcb_subc_t *sc = (pcb_subc_t *)e->value; - pcb_add_subc_to_data(PCB->Data, sc); + pcb_subc_reg(PCB->Data, sc); pcb_subc_bbox(sc); if (PCB->Data->subc_tree == NULL) PCB->Data->subc_tree = pcb_r_create_tree(); Index: trunk/src_plugins/io_autotrax/read.c =================================================================== --- trunk/src_plugins/io_autotrax/read.c (revision 20183) +++ trunk/src_plugins/io_autotrax/read.c (revision 20184) @@ -1019,7 +1019,7 @@ new_module = pcb_subc_alloc(); pcb_subc_create_aux(new_module, module_X, module_Y, 0.0, 0); pcb_attribute_put(&new_module->Attributes, "refdes", "A1"); - pcb_add_subc_to_data(st->pcb->Data, new_module); + pcb_subc_reg(st->pcb->Data, new_module); pcb_subc_bind_globals(st->pcb, new_module); nonempty = 0; Index: trunk/src_plugins/io_eagle/read.c =================================================================== --- trunk/src_plugins/io_eagle/read.c (revision 20183) +++ trunk/src_plugins/io_eagle/read.c (revision 20184) @@ -951,7 +951,7 @@ subc = pcb_subc_alloc(); pcb_attribute_put(&subc->Attributes, "refdes", "K1"); - pcb_add_subc_to_data(st->pcb->Data, subc); + pcb_subc_reg(st->pcb->Data, subc); pcb_subc_bind_globals(st->pcb, subc); eagle_read_pkg(st, n, subc); if (pcb_data_is_empty(subc->data)) { Index: trunk/src_plugins/io_hyp/parser.c =================================================================== --- trunk/src_plugins/io_hyp/parser.c (revision 20183) +++ trunk/src_plugins/io_hyp/parser.c (revision 20184) @@ -465,7 +465,7 @@ pcb_subc_create_aux(subc, x, y, 0.0, on_bottom); pcb_attribute_put(&subc->Attributes, "refdes", refdes); pcb_subc_add_refdes_text(subc, x, y, text_direction, text_scale, on_bottom); - pcb_add_subc_to_data(hyp_dest, subc); + pcb_subc_reg(hyp_dest, subc); pcb_subc_bind_globals(hyp_dest->parent.board, subc); dev->subc = subc; Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 20183) +++ trunk/src_plugins/io_kicad/read.c (revision 20184) @@ -1560,7 +1560,7 @@ pcb_attribute_put(&subc->Attributes, "refdes", "K1"); } if (st->pcb != NULL) { - pcb_add_subc_to_data(st->pcb->Data, subc); + pcb_subc_reg(st->pcb->Data, subc); pcb_subc_bind_globals(st->pcb, subc); } @@ -2368,7 +2368,7 @@ pcb_subc_rebind(st->pcb, subc); } else - pcb_add_subc_to_data(st->fp_data, subc); + pcb_subc_reg(st->fp_data, subc); if ((moduleRotation == 90) || (moduleRotation == 180) || (moduleRotation == 270)) { /* lossles module rotation for round steps */ Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 20183) +++ trunk/src_plugins/io_lihata/read.c (revision 20184) @@ -1209,7 +1209,7 @@ warn_old_model(obj, "element", 3); - pcb_add_subc_to_data(dt, subc); + pcb_subc_reg(dt, subc); parse_id(&subc->ID, obj, 8); parse_flags(&subc->Flags, lht_dom_hash_get(obj, "flags"), PCB_OBJ_ELEMENT, NULL, 0); @@ -1301,7 +1301,7 @@ dt->padstack_tree = pcb_r_create_tree(); sc->data->padstack_tree = dt->padstack_tree; - pcb_add_subc_to_data(dt, sc); + pcb_subc_reg(dt, sc); if (parse_data(pcb, sc->data, lht_dom_hash_get(obj, "data"), dt) == 0) return iolht_error(obj, "Invalid subc: no data\n"); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 20183) +++ trunk/src_plugins/io_pcb/file.c (revision 20184) @@ -990,7 +990,7 @@ { pcb_subc_t *sc = pcb_subc_new(); pcb_text_t *txt; - pcb_add_subc_to_data(Data, sc); + pcb_subc_reg(Data, sc); if (Data->padstack_tree == NULL) Data->padstack_tree = pcb_r_create_tree(); sc->data->padstack_tree = Data->padstack_tree; Index: trunk/src_plugins/io_tedax/footprint.c =================================================================== --- trunk/src_plugins/io_tedax/footprint.c (revision 20183) +++ trunk/src_plugins/io_tedax/footprint.c (revision 20184) @@ -581,7 +581,7 @@ static int tedax_parse_1fp(pcb_data_t *data, FILE *fn, char *buff, int buff_size, char *argv[], int argv_size) { pcb_subc_t *sc = pcb_subc_alloc(); - pcb_add_subc_to_data(data, sc); + pcb_subc_reg(data, sc); if (tedax_parse_1fp_(sc, fn, buff, buff_size, argv, argv_size) != 0) { pcb_subc_free(sc);