Index: trunk/src/obj_pad.h =================================================================== --- trunk/src/obj_pad.h (revision 10905) +++ trunk/src/obj_pad.h (revision 10906) @@ -36,7 +36,7 @@ pcb_coord_t Mask; char *Name, *Number; /* 'Line' */ void *Element; - void *Spare; + void *ratconn; gdl_elem_t link; /* a pad is in a list (element) */ }; Index: trunk/src/obj_pinvia.h =================================================================== --- trunk/src/obj_pinvia.h (revision 10905) +++ trunk/src/obj_pinvia.h (revision 10906) @@ -37,7 +37,7 @@ pcb_coord_t X, Y; /* center and diameter */ char *Name, *Number; void *Element; - void *Spare; + void *ratconn; gdl_elem_t link; /* a pin is in a list (element) */ }; Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 10905) +++ trunk/src/rats.c (revision 10906) @@ -213,13 +213,13 @@ if (Wantlist) { PCB_PIN_ALL_LOOP(PCB->Data); { - pin->Spare = NULL; + pin->ratconn = NULL; PCB_FLAG_CLEAR(PCB_FLAG_DRC, pin); } PCB_ENDALL_LOOP; PCB_PAD_ALL_LOOP(PCB->Data); { - pad->Spare = NULL; + pad->ratconn = NULL; PCB_FLAG_CLEAR(PCB_FLAG_DRC, pad); } PCB_ENDALL_LOOP; @@ -254,9 +254,9 @@ /* mark as visited */ PCB_FLAG_SET(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.obj); if (LastPoint.obj->type == PCB_OBJ_PIN) - ((pcb_pin_t *) LastPoint.obj)->Spare = (void *) menu; + ((pcb_pin_t *) LastPoint.obj)->ratconn = (void *) menu; else - ((pcb_pad_t *) LastPoint.obj)->Spare = (void *) menu; + ((pcb_pad_t *) LastPoint.obj)->ratconn = (void *) menu; } } else @@ -270,9 +270,9 @@ /* mark as visited */ PCB_FLAG_SET(PCB_FLAG_DRC, (pcb_pin_t *) LastPoint.obj); if (LastPoint.obj->type == PCB_OBJ_PIN) - ((pcb_pin_t *) LastPoint.obj)->Spare = (void *) menu; + ((pcb_pin_t *) LastPoint.obj)->ratconn = (void *) menu; else - ((pcb_pad_t *) LastPoint.obj)->Spare = (void *) menu; + ((pcb_pad_t *) LastPoint.obj)->ratconn = (void *) menu; } } PCB_END_LOOP; @@ -336,7 +336,7 @@ /* TODO: should be: !PCB_FLAG_TEST(PCB_FLAG_NONETLIST, (pcb_element_t *)pin->Element)*/ if ((PCB_FLAG_TEST(PCB_FLAG_DRC, pin)) && (!(e->Flags.f & PCB_FLAG_NONETLIST))) { warn = pcb_true; - if (!pin->Spare) { + if (!pin->ratconn) { pcb_message(PCB_MSG_WARNING, _("Warning! Net \"%s\" is shorted to %s pin %s\n"), &theNet->Name[2], PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), PCB_UNKNOWN(pin->Number)); pcb_stub_rat_found_short(pin, NULL, &theNet->Name[2]); @@ -344,7 +344,7 @@ } newone = pcb_true; for(i = 0; i < vtptr_len(&generic); i++) { - if (generic.array[i] == pin->Spare) { + if (generic.array[i] == pin->ratconn) { newone = pcb_false; break; } @@ -352,9 +352,9 @@ if (newone) { menu = vtptr_alloc_append(&generic, 1); - *menu = pin->Spare; + *menu = pin->ratconn; pcb_message(PCB_MSG_WARNING, _("Warning! Net \"%s\" is shorted to net \"%s\"\n"), - &theNet->Name[2], &((pcb_lib_menu_t *) (pin->Spare))->Name[2]); + &theNet->Name[2], &((pcb_lib_menu_t *) (pin->ratconn))->Name[2]); pcb_stub_rat_found_short(pin, NULL, &theNet->Name[2]); } } @@ -366,7 +366,7 @@ /* TODO: should be: !PCB_FLAG_TEST(PCB_FLAG_NONETLIST, (pcb_element_t *)pad->Element)*/ if ((PCB_FLAG_TEST(PCB_FLAG_DRC, pad)) && (!(e->Flags.f & PCB_FLAG_NONETLIST)) && (!(e->Name->Flags.f & PCB_FLAG_NONETLIST))) { warn = pcb_true; - if (!pad->Spare) { + if (!pad->ratconn) { pcb_message(PCB_MSG_WARNING, _("Warning! Net \"%s\" is shorted to %s pad %s\n"), &theNet->Name[2], PCB_UNKNOWN(PCB_ELEM_NAME_REFDES(element)), PCB_UNKNOWN(pad->Number)); pcb_stub_rat_found_short(NULL, pad, &theNet->Name[2]); @@ -374,7 +374,7 @@ } newone = pcb_true; for(i = 0; i < vtptr_len(&generic); i++) { - if (generic.array[i] == pad->Spare) { + if (generic.array[i] == pad->ratconn) { newone = pcb_false; break; } @@ -382,9 +382,9 @@ if (newone) { menu = vtptr_alloc_append(&generic, 1); - *menu = pad->Spare; + *menu = pad->ratconn; pcb_message(PCB_MSG_WARNING, _("Warning! Net \"%s\" is shorted to net \"%s\"\n"), - &theNet->Name[2], &((pcb_lib_menu_t *) (pad->Spare))->Name[2]); + &theNet->Name[2], &((pcb_lib_menu_t *) (pad->ratconn))->Name[2]); pcb_stub_rat_found_short(NULL, pad, &theNet->Name[2]); } } Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 10905) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 10906) @@ -236,9 +236,9 @@ spare = NULL; if (n->to_type == PCB_TYPE_PIN) - spare = ((pcb_pin_t *) n->to)->Spare; + spare = ((pcb_pin_t *) n->to)->ratconn; if (n->to_type == PCB_TYPE_PAD) - spare = ((pcb_pad_t *) n->to)->Spare; + spare = ((pcb_pad_t *) n->to)->ratconn; if (spare != NULL) { void *net = &(((pcb_lib_menu_t *) spare)->Name[2]); debprintf(" net=%s\n", net); @@ -380,8 +380,8 @@ /* check if the rest of the shorts affect the same nets - ignore them if so */ for (i = n->next; i != NULL; i = i->next) { pcb_lib_menu_t *spn, *spi; - spn = (n->pin != NULL) ? n->pin->Spare : n->pad->Spare; - spi = (i->pin != NULL) ? i->pin->Spare : i->pad->Spare; + spn = (n->pin != NULL) ? n->pin->ratconn : n->pad->ratconn; + spi = (i->pin != NULL) ? i->pin->ratconn : i->pad->ratconn; if ((spn == NULL) || (spi == NULL)) continue;