505 |
|
ID tmpid; |
506 |
|
|
507 |
|
if (rp->qflg & FL(Q_LAY)) { /* check layer */ |
508 |
< |
tmpid.name = NULL; |
508 |
> |
tmpid.name = fhead.layer[bp->layer]; |
509 |
|
tmpid.number = bp->layer; |
510 |
|
if (!matchid(&tmpid, &idm(rp)[Q_LAY])) |
511 |
|
return(0); |
563 |
|
static char nambuf[32]; |
564 |
|
static int blkcnt = 0; |
565 |
|
register char *nam; |
566 |
< |
register int i; |
566 |
> |
register int i, j; |
567 |
|
|
568 |
+ |
sprintf(nambuf, "l%d.", bp->layer); |
569 |
+ |
i = strlen(nambuf); |
570 |
|
nam = bp->refid.name; |
569 |
– |
if (nam == NULL) |
570 |
– |
nam = fhead.layer[bp->layer]; |
571 |
|
if (nam == NULL) { |
572 |
< |
sprintf(nambuf, "l%d.", bp->layer); |
573 |
< |
i = strlen(nambuf); |
574 |
< |
} else { |
575 |
< |
for (i = 0; i < 12 && nam[i]; i++) { |
576 |
< |
if (nam[i] == ' ' || nam[i] == '\t') |
577 |
< |
nambuf[i] = '_'; |
572 |
> |
nam = fhead.layer[bp->layer]; |
573 |
> |
if (nam != NULL) |
574 |
> |
i = 0; |
575 |
> |
} |
576 |
> |
if (nam != NULL) { |
577 |
> |
for (j = 0; j < 12 && nam[j]; j++) { |
578 |
> |
if (nam[j] == ' ' || nam[j] == '\t') |
579 |
> |
nambuf[i++] = '_'; |
580 |
|
else |
581 |
< |
nambuf[i] = nam[i]; |
581 |
> |
nambuf[i++] = nam[j]; |
582 |
|
} |
583 |
|
nambuf[i++] = '.'; |
584 |
|
} |