summaryrefslogtreecommitdiffstats
path: root/vtysh
diff options
context:
space:
mode:
authorF. Aragon <paco@voltanet.io>2018-09-12 12:25:27 +0200
committerF. Aragon <paco@voltanet.io>2018-09-12 12:27:38 +0200
commitc683bd446c59dc09d4b19eb47718b014c433d900 (patch)
treed5f3da3a4390fbbc45ac9f9e170fed0ba2d170b7 /vtysh
parentMerge pull request #2944 from thbtcllt/master (diff)
downloadfrr-c683bd446c59dc09d4b19eb47718b014c433d900.tar.xz
frr-c683bd446c59dc09d4b19eb47718b014c433d900.zip
lib vtysh zebra: variable shadowing fixes
Signed-off-by: F. Aragon <paco@voltanet.io>
Diffstat (limited to 'vtysh')
-rw-r--r--vtysh/vtysh_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 7e979f2c8..777eed7b5 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -596,7 +596,6 @@ int main(int argc, char **argv, char **env)
vtysh_execute("enable");
while (cmd != NULL) {
- int ret;
char *eol;
while ((eol = strchr(cmd->line, '\n')) != NULL) {
@@ -662,7 +661,7 @@ int main(int argc, char **argv, char **env)
/* Boot startup configuration file. */
if (boot_flag) {
vtysh_flock_config(frr_config);
- int ret = vtysh_read_config(frr_config);
+ ret = vtysh_read_config(frr_config);
vtysh_unflock_config();
if (ret) {
fprintf(stderr,