Index: trunk/src/find.c =================================================================== --- trunk/src/find.c (revision 21836) +++ trunk/src/find.c (revision 21837) @@ -138,9 +138,9 @@ static pcb_bool LookupLOConnectionsToPolygon(pcb_poly_t *, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToArc(pcb_arc_t *, pcb_cardinal_t); static pcb_bool LookupLOConnectionsToRatEnd(pcb_point_t *, pcb_cardinal_t); -static pcb_bool pcb_isc_rat_line(pcb_point_t *, pcb_line_t *); -static pcb_bool pcb_isc_rat_poly(pcb_point_t *Point, pcb_poly_t *polygon); -static pcb_bool pcb_isc_rat_arc(pcb_point_t *Point, pcb_arc_t *arc); +static pcb_bool pcb_isc_ratp_line(pcb_point_t *, pcb_line_t *); +static pcb_bool pcb_isc_ratp_poly(pcb_point_t *Point, pcb_poly_t *polygon); +static pcb_bool pcb_isc_ratp_arc(pcb_point_t *Point, pcb_arc_t *arc); static pcb_bool pcb_isc_arc_arc(pcb_arc_t *, pcb_arc_t *); static pcb_bool ListsEmpty(pcb_bool); static pcb_bool DoIt(pcb_bool, pcb_bool); Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 21836) +++ trunk/src/find_geo.c (revision 21837) @@ -221,7 +221,7 @@ /* --------------------------------------------------------------------------- * Tests if point is same as line end point or center point */ -static pcb_bool pcb_isc_rat_line(pcb_point_t *Point, pcb_line_t *Line) +static pcb_bool pcb_isc_ratp_line(pcb_point_t *Point, pcb_line_t *Line) { pcb_coord_t cx, cy; @@ -241,7 +241,7 @@ /* --------------------------------------------------------------------------- * Tests if point is same as arc end point or center point */ -static pcb_bool pcb_isc_rat_arc(pcb_point_t *Point, pcb_arc_t *arc) +static pcb_bool pcb_isc_ratp_arc(pcb_point_t *Point, pcb_arc_t *arc) { pcb_coord_t cx, cy; @@ -265,7 +265,7 @@ /* --------------------------------------------------------------------------- * Tests if rat line point is connected to a polygon */ -static pcb_bool pcb_isc_rat_poly(pcb_point_t *Point, pcb_poly_t *polygon) +static pcb_bool pcb_isc_ratp_poly(pcb_point_t *Point, pcb_poly_t *polygon) { pcb_coord_t cx, cy; Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 21836) +++ trunk/src/find_lookup.c (revision 21837) @@ -644,12 +644,12 @@ if (!PCB_FLAG_TEST(TheFlag, rat)) { if ((rat->group1 == i->layer) - && pcb_isc_rat_arc(&rat->Point1, &i->arc)) { + && pcb_isc_ratp_arc(&rat->Point1, &i->arc)) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_ARC, &i->arc, PCB_FCT_RAT, i->orig_arc)) longjmp(i->env, 1); } else if ((rat->group2 == i->layer) - && pcb_isc_rat_arc(&rat->Point2, &i->arc)) { + && pcb_isc_ratp_arc(&rat->Point2, &i->arc)) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_ARC, &i->arc, PCB_FCT_RAT, i->orig_arc)) longjmp(i->env, 1); } @@ -749,12 +749,12 @@ if (!PCB_FLAG_TEST(TheFlag, rat)) { if ((rat->group1 == i->layer) - && pcb_isc_rat_line(&rat->Point1, &i->line)) { + && pcb_isc_ratp_line(&rat->Point1, &i->line)) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_LINE, &i->line, PCB_FCT_RAT, i->orig_line)) longjmp(i->env, 1); } else if ((rat->group2 == i->layer) - && pcb_isc_rat_line(&rat->Point2, &i->line)) { + && pcb_isc_ratp_line(&rat->Point2, &i->line)) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_LINE, &i->line, PCB_FCT_RAT, i->orig_line)) longjmp(i->env, 1); } @@ -828,7 +828,7 @@ pcb_line_t *line = (pcb_line_t *) b; struct rat_info *i = (struct rat_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, line) && pcb_isc_rat_line(i->Point, line)) { + if (!PCB_FLAG_TEST(TheFlag, line) && pcb_isc_ratp_line(i->Point, line)) { if (ADD_LINE_TO_LIST(i->layer, line, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT, NULL)) longjmp(i->env, 1); } @@ -840,7 +840,7 @@ pcb_arc_t *arc = (pcb_arc_t *) b; struct rat_info *i = (struct rat_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_isc_rat_arc(i->Point, arc)) { + if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_isc_ratp_arc(i->Point, arc)) { if (ADD_ARC_TO_LIST(i->layer, arc, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT, NULL)) longjmp(i->env, 1); } @@ -852,7 +852,7 @@ pcb_poly_t *polygon = (pcb_poly_t *) b; struct rat_info *i = (struct rat_info *) cl; - if (!PCB_FLAG_TEST(TheFlag, polygon) && polygon->Clipped && pcb_isc_rat_poly(i->Point, polygon)) { + if (!PCB_FLAG_TEST(TheFlag, polygon) && polygon->Clipped && pcb_isc_ratp_poly(i->Point, polygon)) { if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_OBJ_RAT, &i->Point, PCB_FCT_RAT, NULL)) longjmp(i->env, 1); } @@ -923,8 +923,8 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, rat)) { - if (((rat->group1 == i->layer) && pcb_isc_rat_poly(&rat->Point1, &i->polygon)) - || ((rat->group2 == i->layer) && pcb_isc_rat_poly(&rat->Point2, &i->polygon))) { + if (((rat->group1 == i->layer) && pcb_isc_ratp_poly(&rat->Point1, &i->polygon)) + || ((rat->group2 == i->layer) && pcb_isc_ratp_poly(&rat->Point2, &i->polygon))) { if (ADD_RAT_TO_LIST(rat, PCB_OBJ_POLY, &i->polygon, PCB_FCT_RAT, i->orig_polygon)) longjmp(i->env, 1); }