Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Shadowed #12696

Merged
merged 4 commits into from
Jan 27, 2023
Merged

Shadowed #12696

merged 4 commits into from
Jan 27, 2023

Conversation

donaldsharp
Copy link
Member

found a bunch of places where variables have shadowed other variables. Let's clean it up

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jan 26, 2023 •
edited
Loading

Continuous Integration Result: FAILED

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Successful

Building Stage: Failed

FreeBSD 11 amd64 build: Failed (click for details) FreeBSD 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/artifact/CI009BUILD/config.log/config.log.gz FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/artifact/CI009BUILD/config.status/config.status

Make failed for FreeBSD 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/artifact/CI009BUILD/ErrorLog/log_make.txt)

/usr/home/ci/cibuild.9407/frr-source/doc/user/zebra.rst:755: WARNING: duplicate clicmd description of locator NAME, other instance in bgp
zebra/kernel_socket.c: In function 'rtm_read':
zebra/kernel_socket.c:1074:50: error: 'pid' undeclared (first use in this function)
 1074 |  if (rtm->rtm_type != RTM_GET && rtm->rtm_pid == pid)
zebra/kernel_socket.c:1074:50: note: each undeclared identifier is reported only once for each function it appears in
gmake[1]: *** [Makefile:10250: zebra/kernel_socket.o] Error 1
gmake[1]: Leaving directory '/usr/home/ci/cibuild.9407/frr-source'
gmake[1]: Target 'all-am' not remade because of errors.
gmake: *** [Makefile:6249: all] Error 2
OpenBSD 7 amd64 build: Failed (click for details) OpenBSD 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/artifact/CI011BUILD/config.log/config.log.gz OpenBSD 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/artifact/CI011BUILD/config.status/config.status

Make failed for OpenBSD 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/artifact/CI011BUILD/ErrorLog/log_make.txt)

/home/ci/cibuild.9407/frr-source/doc/user/zebra.rst:742: WARNING: duplicate clicmd description of segment-routing, other instance in pathd
/home/ci/cibuild.9407/frr-source/doc/user/zebra.rst:755: WARNING: duplicate clicmd description of locator NAME, other instance in bgp
zebra/kernel_socket.c:1074:50: error: use of undeclared identifier 'pid'
1 error generated.
gmake[1]: *** [Makefile:10250: zebra/kernel_socket.o] Error 1
gmake[1]: Leaving directory '/home/ci/cibuild.9407/frr-source'
gmake[1]: Target 'all-am' not remade because of errors.
gmake: *** [Makefile:6249: all] Error 2
FreeBSD 12 amd64 build: Failed (click for details) FreeBSD 12 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/artifact/FBSD12AMD64/config.log/config.log.gz FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/artifact/FBSD12AMD64/config.status/config.status

Make failed for FreeBSD 12 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-9407/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

/usr/home/ci/cibuild.9407/frr-source/doc/user/pbr.rst:49: WARNING: duplicate label nexthop-groups, other instance in /usr/home/ci/cibuild.9407/frr-source/doc/user/nexthop_groups.rst
zebra/kernel_socket.c: In function 'rtm_read':
zebra/kernel_socket.c:1074:50: error: 'pid' undeclared (first use in this function)
zebra/kernel_socket.c:1074:50: note: each undeclared identifier is reported only once for each function it appears in
gmake[1]: *** [Makefile:10247: zebra/kernel_socket.o] Error 1
gmake[1]: Leaving directory '/usr/home/ci/cibuild.9407/frr-source'
gmake[1]: Target 'all-am' not remade because of errors.
gmake: *** [Makefile:6246: all] Error 2
Successful on other platforms/tests
  • Ubuntu 22.04 amd64 build
  • Fedora 29 amd64 build
  • Ubuntu 18.04 arm8 build
  • Debian 9 amd64 build
  • Ubuntu 18.04 ppc64le build
  • Ubuntu 20.04 amd64 build
  • Debian 10 amd64 build
  • CentOS 7 amd64 build
  • Ubuntu 16.04 arm7 build
  • Debian 11 amd64 build
  • Ubuntu 18.04 arm7 build
  • Ubuntu 16.04 i386 build
  • Ubuntu 18.04 amd64 build
  • Ubuntu 16.04 arm8 build
  • Ubuntu 16.04 amd64 build
  • Redhat 9 amd64 build
  • Redhat 8 amd64 build
  • Ubuntu 18.04 i386 build

@donaldsharp
lib: Forward declaration of a struct does not need to have data type
08c3dba 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
@donaldsharp
zebra: i declaration shadows other i declared
75c87b7 
Clear up some confustion

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
@donaldsharp
watchfrr: dmn variable shadows previous declaration
9ca6d3d 
There is no need to declar the same temp variable 2 times.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
@donaldsharp
lib: Remove global variable exposure struct host host
8586a88 
This was only used in one place and we have accessor functions
now.  So let's use them.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
@github-actions github-actions bot added size/S and removed size/M labels Jan 26, 2023
@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-9410/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

ton31337
ton31337 approved these changes Jan 27, 2023
View reviewed changes
Copy link
Member

@ton31337 ton31337 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ton31337 ton31337 merged commit a2ec3f4 into FRRouting:master Jan 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rzalamena rzalamena rzalamena approved these changes

@ton31337 ton31337 ton31337 approved these changes

Assignees
No one assigned
Labels
libfrr master size/S watchfrr zebra
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@donaldsharp @NetDEF-CI @rzalamena @ton31337