From: paco <paco@voltanet.io>
Date: Wed, 13 Jun 2018 10:34:23 +0000 (+0200)
Subject: ospfd: dead code (Coverity 1399232)
X-Git-Tag: frr-6.1-dev~334^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=92692be16af49a611933ef054f28419612a8d89c;p=matthieu%2Ffrr.git

ospfd: dead code (Coverity 1399232)

Signed-off-by: F. Aragon <paco@voltanet.io>
---

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 21567c6ce6..7218f9664f 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -8084,9 +8084,6 @@ DEFUN (ospf_redistribute_source,
 	struct ospf_redist *red;
 	int idx = 0;
 
-	if (!ospf)
-		return CMD_SUCCESS;
-
 	/* Get distribute source. */
 	source = proto_redistnum(AFI_IP, argv[idx_protocol]->text);
 	if (source < 0)
@@ -8169,16 +8166,10 @@ DEFUN (ospf_redistribute_instance_source,
 	unsigned short instance;
 	struct ospf_redist *red;
 
-	if (!ospf)
-		return CMD_SUCCESS;
-
 	source = proto_redistnum(AFI_IP, argv[idx_ospf_table]->text);
 
 	instance = strtoul(argv[idx_number]->arg, NULL, 10);
 
-	if (!ospf)
-		return CMD_SUCCESS;
-
 	if ((source == ZEBRA_ROUTE_OSPF) && !ospf->instance) {
 		vty_out(vty,
 			"Instance redistribution in non-instanced OSPF not allowed\n");
@@ -8469,9 +8460,6 @@ DEFUN (no_ospf_distance_ospf,
 	VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
 	int idx = 0;
 
-	if (!ospf)
-		return CMD_SUCCESS;
-
 	if (argv_find(argv, argc, "intra-area", &idx) || argc == 3)
 		idx = ospf->distance_intra = 0;
 	if (argv_find(argv, argc, "inter-area", &idx) || argc == 3)
@@ -8525,9 +8513,6 @@ DEFUN (ospf_distance_source,
   int idx_number = 1;
   int idx_ipv4_prefixlen = 2;
 
-  if (!ospf)
-    return CMD_SUCCESS;
-
   ospf_distance_set (vty, ospf, argv[idx_number]->arg, argv[idx_ipv4_prefixlen]->arg, NULL);
 
   return CMD_SUCCESS;
@@ -8545,9 +8530,6 @@ DEFUN (no_ospf_distance_source,
   int idx_number = 2;
   int idx_ipv4_prefixlen = 3;
 
-  if (!ospf)
-    return CMD_SUCCESS;
-
   ospf_distance_unset (vty, ospf, argv[idx_number]->arg, argv[idx_ipv4_prefixlen]->arg, NULL);
 
   return CMD_SUCCESS;
@@ -8566,9 +8548,6 @@ DEFUN (ospf_distance_source_access_list,
   int idx_ipv4_prefixlen = 2;
   int idx_word = 3;
 
-  if (!ospf)
-    return CMD_SUCCESS;
-
   ospf_distance_set (vty, ospf, argv[idx_number]->arg, argv[idx_ipv4_prefixlen]->arg, argv[idx_word]->arg);
 
   return CMD_SUCCESS;
@@ -8588,9 +8567,6 @@ DEFUN (no_ospf_distance_source_access_list,
   int idx_ipv4_prefixlen = 3;
   int idx_word = 4;
 
-  if (!ospf)
-    return CMD_SUCCESS;
-
   ospf_distance_unset (vty, ospf, argv[idx_number]->arg, argv[idx_ipv4_prefixlen]->arg, argv[idx_word]->arg);
 
   return CMD_SUCCESS;