summaryrefslogtreecommitdiffstats
path: root/isisd
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2015-03-03 08:56:35 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-06-07 15:00:37 +0200
commitbfac306056ffe52c7b295338eeaf08e17c6c882d (patch)
treec688243eedd5b145972b732e4b2097ca4d509e56 /isisd
parentbgpd, zebra: fix struct/pointer sizeof mixups (diff)
downloadfrr-bfac306056ffe52c7b295338eeaf08e17c6c882d.tar.xz
frr-bfac306056ffe52c7b295338eeaf08e17c6c882d.zip
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>
Diffstat (limited to 'isisd')
-rw-r--r--isisd/topology/spgrid.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/isisd/topology/spgrid.c b/isisd/topology/spgrid.c
index df09d0b2b..40147fb5b 100644
--- a/isisd/topology/spgrid.c
+++ b/isisd/topology/spgrid.c
@@ -50,8 +50,8 @@ long X, /* horizontal size of grid */
long x,
y,
- ya1, y2, yp,
- dl, dx, xn, yan, count,
+ yy1, yy2, yyp,
+ dl, dx, xn, yyn, count,
*mess;
double n;
@@ -670,12 +670,12 @@ gen_spgrid_topology (struct vty *vty, struct list *topology)
for ( k = ax; k > 0; k -- )
{
- ya1 = nrand ( Y );
+ yy1 = nrand ( Y );
do
- y2 = nrand ( Y );
- while ( y2 == ya1 );
- i = NODE ( x, ya1 );
- j = NODE ( x, y2 );
+ yy2 = nrand ( Y );
+ while ( yy2 == yy1 );
+ i = NODE ( x, yy1 );
+ j = NODE ( x, yy2 );
l = am + nrand ( al );
print_arc (vty, topology, i, j, l );
}
@@ -711,13 +711,13 @@ gen_spgrid_topology (struct vty *vty, struct list *topology)
dx = xn - x;
if ( ip_f )
{
- yp = nrand(Y-y);
- yan = mess[ yp ];
- mess[ yp ] = mess[ Y - y - 1 ];
+ yyp = nrand(Y-y);
+ yyn = mess[ yyp ];
+ mess[ yyp ] = mess[ Y - y - 1 ];
}
else
- yan = y;
- j = NODE ( xn, yan );
+ yyn = y;
+ j = NODE ( xn, yyn );
l = im + nrand ( il );
if ( in != 0 )
l *= (long) ( in * dx );