summaryrefslogtreecommitdiff
path: root/lib/libfrr.c
diff options
context:
space:
mode:
authorMark Stapp <mjs@cisco.com>2025-01-30 11:39:00 -0500
committerMark Stapp <mjs@cisco.com>2025-04-08 14:41:26 -0400
commit028872bf40fa1a6a165289f6fe278e45fad9d04a (patch)
tree136f0f60e51e7193eef54608f2dd109d6d6d9a70 /lib/libfrr.c
parentd683c4d8de15bb446247909cbe97e3cd19c2e0fb (diff)
lib: fix -Wshadow warnings in the lib modules
Fix various "shadow" warnings in lib. Signed-off-by: Mark Stapp <mjs@cisco.com>
Diffstat (limited to 'lib/libfrr.c')
-rw-r--r--lib/libfrr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libfrr.c b/lib/libfrr.c
index 8a37b51c47..d40624a102 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -1192,9 +1192,10 @@ void frr_detach(void)
frr_check_detach();
}
-void frr_run(struct event_loop *master)
+void frr_run(struct event_loop *loop)
{
char instanceinfo[64] = "";
+ struct event thread;
if (!(di->flags & FRR_MANUAL_VTY_START))
frr_vty_serv_start(false);
@@ -1212,7 +1213,7 @@ void frr_run(struct event_loop *master)
vty_stdio(frr_terminal_close);
if (daemon_ctl_sock != -1) {
set_nonblocking(daemon_ctl_sock);
- event_add_read(master, frr_daemon_ctl, NULL,
+ event_add_read(loop, frr_daemon_ctl, NULL,
daemon_ctl_sock, &daemon_ctl_thread);
}
} else if (di->daemon_mode) {
@@ -1242,8 +1243,7 @@ void frr_run(struct event_loop *master)
/* end fixed stderr startup logging */
zlog_startup_end();
- struct event thread;
- while (event_fetch(master, &thread))
+ while (event_fetch(loop, &thread))
event_call(&thread);
}