Index: trunk/src/plugins/rt_topo/crbs.c =================================================================== --- trunk/src/plugins/rt_topo/crbs.c (revision 1433) +++ trunk/src/plugins/rt_topo/crbs.c (revision 1434) @@ -43,7 +43,7 @@ static void crbs_coll_report_cb(grbs_t *grbs, grbs_2net_t *tn, grbs_2net_t *coll_tn, grbs_arc_t *coll_arc) { - crbs_t *crbs = grbs->user_data; +/* crbs_t *crbs = grbs->user_data;*/ crbs_2net_t *coll_ctn = coll_tn->user_data; /* crbs_2net_t *ctn = tn->user_data;*/ Index: trunk/src/plugins/rt_topo/crbs_cdt.c =================================================================== --- trunk/src/plugins/rt_topo/crbs_cdt.c (revision 1433) +++ trunk/src/plugins/rt_topo/crbs_cdt.c (revision 1434) @@ -64,7 +64,7 @@ int immut = 1; /* because constrained in the cdt, we do not ever want these to move in grbs */ if (len2 > maxlen2) { - double d, len, x, y; + double len, x, y; long spn, n; point_t *lp, *p; @@ -108,7 +108,6 @@ point_t *p1, *p2; cdt_t *cdt = &crbs->cdt; rtp_vertex_t *v; - edge_t *e; long n; double maxl2, maxlen = (rt_topo_cfg.wire_thick + rt_topo_cfg.wire_clr/2) * 50; /* split long constrained edges so that no segment is longer than this value */ double cop, clr; @@ -153,7 +152,6 @@ minlen2 = minlen * minlen; for(n = 0; n < cdt->edges.used; n++) { - double len; edge_t *e = cdt->edges.array[n]; double dx, dy, len2; Index: trunk/src/plugins/rt_topo/crbs_route.c =================================================================== --- trunk/src/plugins/rt_topo/crbs_route.c (revision 1433) +++ trunk/src/plugins/rt_topo/crbs_route.c (revision 1434) @@ -426,7 +426,7 @@ usrch_a_star_t ast = {0}; usrch_a_star_node_t *it; grbs_detached_addr_t addr_tmp[2]; - grbs_detached_addr_t *first, *da, *prev; + grbs_detached_addr_t *first, *da; grbs_addr_t *na, *pa, *firsta, *lasta; crbs_2net_t *tn; int res = -1; @@ -496,12 +496,11 @@ } /* build from start to end, in the original order */ - prev = first; firsta = NULL; lasta = pa = grbs_addr_new(&crbs->grbs, ADDR_POINT, first->pt); lasta->user_data = NULL; printf("GT 2net_new %s %f %f from P%ld", ctn->tn->net->hdr.oid, rt_topo_cfg.wire_thick, rt_topo_cfg.wire_clr, first->pt->uid); - for(da = first->user_data; da != NULL; prev = da, da = da->user_data) { + for(da = first->user_data; da != NULL; da = da->user_data) { hop_cnt++; switch(da->user_long) { case GRBS_ADIR_INC: printf(" to P%ld", da->pt->uid); break; @@ -667,7 +666,7 @@ crbs_t crbs; rt_topo_2net_t *t; rtrnd_layer_t ly_cdt = {0}, ly_bnk = {0}; - int res, tries; + int res; memset(&crbs, 0, sizeof(crbs_t)); crbs.disable_vconcave = 0; Index: trunk/src/plugins/rt_topo/laa3_solve.c =================================================================== --- trunk/src/plugins/rt_topo/laa3_solve.c (revision 1433) +++ trunk/src/plugins/rt_topo/laa3_solve.c (revision 1434) @@ -138,8 +138,7 @@ printf("laa3 solver gain: %f", best_gain); if (best_gain > 0) { - rtrnd_crossing_t *cr = &best_tn->cross.array[best_ci], *cr2; - int cridx2; + rtrnd_crossing_t *cr = &best_tn->cross.array[best_ci]; printf(" by moving tn %p seg %d from layer %d to %d\n", best_tn, best_ci, best_tn->asg[cr->bridx], best_lid); best_tn->asg[cr->bridx] = best_lid; @@ -153,8 +152,10 @@ same coord as an unrelated pin; common when the board uses grid and well aligned pins */ #ifdef DOUBLE_CHECK_CROSSING + { + int cridx2; for(cridx2 = 0; cridx2 < cr->cn->cross.used; cridx2++) { - cr2 = &cr->cn->cross.array[cridx2]; + rtrnd_crossing_t *cr2 = &cr->cn->cross.array[cridx2]; if ((fabs(cr2->x-cr->x) < 0.0001) && (fabs(cr2->y-cr->y) < 0.0001)) { if (cr->cn_cr != cr2) printf(" update2 mismatch %d %d at {%f %f} vs {%f %f} (%p == %p)\n", cr->cn_bridx, cr2->bridx, cr->x, cr->y, cr2->x, cr2->y, cr->cn_cr, cr2); @@ -161,6 +162,7 @@ assert(cr->cn_cr == cr2); } } + } #endif } Index: trunk/src/plugins/rt_topo/trbs_cdt.c =================================================================== --- trunk/src/plugins/rt_topo/trbs_cdt.c (revision 1433) +++ trunk/src/plugins/rt_topo/trbs_cdt.c (revision 1434) @@ -235,21 +235,18 @@ /* ... this second loop is creating the new points and actual constrained edges as mapped in the first loop above */ for(n = n2 = 0; n < vp.used; n += 2, n2 += 2) { - int i; double x = vc.array[n2], y = vc.array[n2+1]; - point_t *opp = vp.array[n], *np; + point_t *opp = vp.array[n], *newp; edge_t *e = vp.array[n+1]; rtrnd_any_obj_t *p_obj; - np = rtrnd_line_new(ly_dbg, NULL, NULL, x, y, opp->pos.x, opp->pos.y, 0.2, 0); - if (((trbs_point_t *)e->endp[0]->data)->obj == ((trbs_point_t *)e->endp[1]->data)->obj) { - trbs_point_t *ntp = np->data; + rtrnd_line_new(ly_dbg, NULL, NULL, x, y, opp->pos.x, opp->pos.y, 0.2, 0); + if (((trbs_point_t *)e->endp[0]->data)->obj == ((trbs_point_t *)e->endp[1]->data)->obj) p_obj = ((trbs_point_t *)e->endp[0]->data)->obj; - } else p_obj = NULL; - point_t *newp = trbs_insert_point(trbs, x, y, p_obj, NULL); + newp = trbs_insert_point(trbs, x, y, p_obj, NULL); if (newp != NULL) { printf(" insert: P%ld (%f;%f) obj=%p\n", ((trbs_point_t *)newp->data)->uid, newp->pos.x, newp->pos.y, p_obj); {