isisd: don't use POSIX reserved y1/yn names

y1 and yn are POSIX standard names for Bessel functions.  For
consistency, just rename all of these variables from "y" to "yy".

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2015-03-03 08:56:35 +01:00 committed by Donald Sharp
parent f2d193ab32
commit bfac306056

View File

@ -50,8 +50,8 @@ long X, /* horizontal size of grid */
long x, long x,
y, y,
ya1, y2, yp, yy1, yy2, yyp,
dl, dx, xn, yan, count, dl, dx, xn, yyn, count,
*mess; *mess;
double n; double n;
@ -670,12 +670,12 @@ gen_spgrid_topology (struct vty *vty, struct list *topology)
for ( k = ax; k > 0; k -- ) for ( k = ax; k > 0; k -- )
{ {
ya1 = nrand ( Y ); yy1 = nrand ( Y );
do do
y2 = nrand ( Y ); yy2 = nrand ( Y );
while ( y2 == ya1 ); while ( yy2 == yy1 );
i = NODE ( x, ya1 ); i = NODE ( x, yy1 );
j = NODE ( x, y2 ); j = NODE ( x, yy2 );
l = am + nrand ( al ); l = am + nrand ( al );
print_arc (vty, topology, i, j, l ); print_arc (vty, topology, i, j, l );
} }
@ -711,13 +711,13 @@ gen_spgrid_topology (struct vty *vty, struct list *topology)
dx = xn - x; dx = xn - x;
if ( ip_f ) if ( ip_f )
{ {
yp = nrand(Y-y); yyp = nrand(Y-y);
yan = mess[ yp ]; yyn = mess[ yyp ];
mess[ yp ] = mess[ Y - y - 1 ]; mess[ yyp ] = mess[ Y - y - 1 ];
} }
else else
yan = y; yyn = y;
j = NODE ( xn, yan ); j = NODE ( xn, yyn );
l = im + nrand ( il ); l = im + nrand ( il );
if ( in != 0 ) if ( in != 0 )
l *= (long) ( in * dx ); l *= (long) ( in * dx );