Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 29119) +++ trunk/src/netlist.c (revision 29120) @@ -81,7 +81,7 @@ return t; } -pcb_net_term_t *pcb_net_term_get(pcb_net_t *net, const char *refdes, const char *term, pcb_bool alloc) +pcb_net_term_t *pcb_net_term_get(pcb_net_t *net, const char *refdes, const char *term, pcb_net_alloc_t alloc) { pcb_net_term_t *t; @@ -119,10 +119,10 @@ if (sc->refdes == NULL) return NULL; - return pcb_net_term_get(net, sc->refdes, obj->term, pcb_false); + return pcb_net_term_get(net, sc->refdes, obj->term, PCB_NETA_NOALLOC); } -pcb_net_term_t *pcb_net_term_get_by_pinname(pcb_net_t *net, const char *pinname, pcb_bool alloc) +pcb_net_term_t *pcb_net_term_get_by_pinname(pcb_net_t *net, const char *pinname, pcb_net_alloc_t alloc) { char tmp[256]; char *pn, *refdes, *term; @@ -947,7 +947,7 @@ res = pcb_rat_new(pcb->Data, -1, x1, y1, x2, y2, group1, group2, conf_core.appearance.rat_thickness, pcb_no_flags(), o1, o2); old_len = pcb_termlist_length(&target_net->conns); - pcb_net_term_get(target_net, sc1->refdes, o1->term, 1); + pcb_net_term_get(target_net, sc1->refdes, o1->term, PCB_NETA_ALLOC); new_len = pcb_termlist_length(&target_net->conns); if (new_len != old_len) { id = pcb_concat(sc1->refdes, "-", o1->term, NULL); @@ -956,7 +956,7 @@ } old_len = new_len; - pcb_net_term_get(target_net, sc2->refdes, o2->term, 1); + pcb_net_term_get(target_net, sc2->refdes, o2->term, PCB_NETA_ALLOC); new_len = pcb_termlist_length(&target_net->conns); if (new_len != old_len) { id = pcb_concat(sc2->refdes, "-", o2->term, NULL); Index: trunk/src/netlist.h =================================================================== --- trunk/src/netlist.h (revision 29119) +++ trunk/src/netlist.h (revision 29120) @@ -100,9 +100,9 @@ /* Look up (or allocate) a terminal within a net. Pinname is "refdes-termid". Returns NULL on error */ -pcb_net_term_t *pcb_net_term_get(pcb_net_t *net, const char *refdes, const char *term, pcb_bool alloc); +pcb_net_term_t *pcb_net_term_get(pcb_net_t *net, const char *refdes, const char *term, pcb_net_alloc_t alloc); pcb_net_term_t *pcb_net_term_get_by_obj(pcb_net_t *net, const pcb_any_obj_t *obj); -pcb_net_term_t *pcb_net_term_get_by_pinname(pcb_net_t *net, const char *pinname, pcb_bool alloc); +pcb_net_term_t *pcb_net_term_get_by_pinname(pcb_net_t *net, const char *pinname, pcb_net_alloc_t alloc); /* Remove term from its net and free all fields and term itself */ int pcb_net_term_del(pcb_net_t *net, pcb_net_term_t *term); Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 29119) +++ trunk/src/netlist_act.c (revision 29120) @@ -134,14 +134,14 @@ return -1; n = pcb_net_get(PCB, &PCB->netlist[PCB_NETLIST_INPUT+(!!patch)], netname, PCB_NETA_ALLOC); - t = pcb_net_term_get_by_pinname(n, pinname, 0); + t = pcb_net_term_get_by_pinname(n, pinname, PCB_NETA_NOALLOC); if (t == NULL) { if (!patch) { - t = pcb_net_term_get_by_pinname(n, pinname, 1); + t = pcb_net_term_get_by_pinname(n, pinname, PCB_NETA_ALLOC); PCB->netlist_needs_update=1; } else { - t = pcb_net_term_get_by_pinname(n, pinname, 1); + t = pcb_net_term_get_by_pinname(n, pinname, PCB_NETA_ALLOC); pcb_ratspatch_append_optimize(PCB, RATP_ADD_CONN, pinname, netname, NULL); } } @@ -339,7 +339,7 @@ pcb_net_term_del(nfrom, t); pcb_ratspatch_append_optimize(PCB, RATP_DEL_CONN, pinname, nfrom->name, NULL); - pcb_net_term_get_by_pinname(nto, pinname, 1); + pcb_net_term_get_by_pinname(nto, pinname, PCB_NETA_ALLOC); pcb_ratspatch_append_optimize(PCB, RATP_ADD_CONN, pinname, nto->name, NULL); free(pinname); @@ -525,7 +525,7 @@ free(pinname); } - t = pcb_net_term_get(net, subc->refdes, obj->term, 1); + t = pcb_net_term_get(net, subc->refdes, obj->term, PCB_NETA_ALLOC); pinname = pcb_strdup_printf("%s-%s", t->refdes, t->term); pcb_ratspatch_append_optimize(PCB, RATP_ADD_CONN, pinname, net->name, NULL); free(pinname); Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 29119) +++ trunk/src/rats_patch.c (revision 29120) @@ -281,7 +281,7 @@ /* Wanted to add, let's add it */ *sep = '\0'; - term = pcb_net_term_get(net, patch->id, termid, 1); + term = pcb_net_term_get(net, patch->id, termid, PCB_NETA_ALLOC); *sep = '-'; if (term != NULL) return 0; Index: trunk/src_plugins/import_edif/edif.c =================================================================== --- trunk/src_plugins/import_edif/edif.c (revision 29119) +++ trunk/src_plugins/import_edif/edif.c (revision 29120) @@ -253,7 +253,7 @@ free(node->str1); free(node->str2); - pcb_net_term_get_by_pinname(net, buf, 1); + pcb_net_term_get_by_pinname(net, buf, PCB_NETA_ALLOC); done_node = node; node = node->next; Index: trunk/src_plugins/import_edif/edif.y =================================================================== --- trunk/src_plugins/import_edif/edif.y (revision 29119) +++ trunk/src_plugins/import_edif/edif.y (revision 29120) @@ -176,7 +176,7 @@ free(node->str1); free(node->str2); - pcb_net_term_get_by_pinname(net, buf, 1); + pcb_net_term_get_by_pinname(net, buf, PCB_NETA_ALLOC); done_node = node; node = node->next; Index: trunk/src_plugins/import_netlist/import_netlist.c =================================================================== --- trunk/src_plugins/import_netlist/import_netlist.c (revision 29119) +++ trunk/src_plugins/import_netlist/import_netlist.c (revision 29120) @@ -136,7 +136,7 @@ pcb_attribute_put(&net->Attributes, "style", temp); } else { - pcb_net_term_get_by_pinname(net, temp, 1); + pcb_net_term_get_by_pinname(net, temp, PCB_NETA_ALLOC); } } } Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 29119) +++ trunk/src_plugins/io_kicad/read.c (revision 29120) @@ -1865,7 +1865,7 @@ if (net == NULL) return kicad_error(subtree, "Can not connect pad %s-%s to net '%s': no such net", subc->refdes, pin_name, netname); - term = pcb_net_term_get(net, subc->refdes, pin_name, 1); + term = pcb_net_term_get(net, subc->refdes, pin_name, PCB_NETA_ALLOC); if (term == NULL) return kicad_error(subtree, "Failed to connect pad to net '%s'", netname); } Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 29119) +++ trunk/src_plugins/io_lihata/read.c (revision 29120) @@ -2139,7 +2139,7 @@ for(nt = nconn->data.list.first; nt != NULL; nt = nt->next) { if ((nt->type != LHT_TEXT) || (*nt->data.text.value == '\0')) return iolht_error(nt, "terminal id must be a non-empty text\n"); - if (pcb_net_term_get_by_pinname(net, nt->data.text.value, 1) == NULL) + if (pcb_net_term_get_by_pinname(net, nt->data.text.value, PCB_NETA_ALLOC) == NULL) return iolht_error(nt, "failed to add terminal id to network\n"); } } Index: trunk/src_plugins/io_mentor_cell/read_net.c =================================================================== --- trunk/src_plugins/io_mentor_cell/read_net.c (revision 29119) +++ trunk/src_plugins/io_mentor_cell/read_net.c (revision 29120) @@ -165,7 +165,7 @@ pcb_net_term_t *term; if (strcmp(p->argv[0], "REF_PINNAME") != 0) continue; - term = pcb_net_term_get_by_pinname(net, p->argv[1], 1); + term = pcb_net_term_get_by_pinname(net, p->argv[1], PCB_NETA_ALLOC); if (term == NULL) hkp_error(p, "Failed to create pin '%s' in net '%s' - netlist will be incomplete\n", p->argv[1], nnet->argv[1]); }