From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 7 Dec 2016 19:05:46 +0000 (-0500)
Subject: pimd: Remove unused zclient_debug variable
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~23
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=be5770d770d79d6436aa4e6d518dc93ccade99cd;p=mirror%2Ffrr.git

pimd: Remove unused zclient_debug variable

Remove code that sets the pim_zclient_debug variable
but is never used.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index 6ce4f678a9..2bfe9c91ca 100644
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -20,7 +20,6 @@
 # 330, Boston, MA 02111-1307, USA.
 
 # PIM_DEBUG_BYDEFAULT: Automatically enables all pimd "debug ..." commands
-# PIM_ZCLIENT_DEBUG: Support for internal ZEBRA client debugging
 # PIM_CHECK_RECV_IFINDEX_SANITY: Compare socket ifindex with recv ifindex
 # PIM_REPORT_RECV_IFINDEX_MISMATCH: Report sock/recv ifindex mismatch
 # PIM_ENFORCE_LOOPFREE_MFC: Refuse adding looping MFC entries
@@ -30,7 +29,6 @@ PIM_DEFS =
 #PIM_DEFS += -DPIM_DEBUG_BYDEFAULT
 #PIM_DEFS += -DPIM_CHECK_RECV_IFINDEX_SANITY
 #PIM_DEFS += -DPIM_REPORT_RECV_IFINDEX_MISMATCH
-PIM_DEFS += -DPIM_ZCLIENT_DEBUG
 PIM_DEFS += -DPIM_ENFORCE_LOOPFREE_MFC
 #PIM_DEFS += -DPIM_UNEXPECTED_KERNEL_UPCALL
 
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 39cab7fb97..7fc9bc524e 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -48,10 +48,6 @@
 #include "pim_iface.h"
 #include "pim_rp.h"
 
-#ifdef PIM_ZCLIENT_DEBUG
-extern int zclient_debug;
-#endif
-
 extern struct host host;
 
 char config_default[] = SYSCONFDIR PIMD_DEFAULT_CONFIG;
@@ -109,15 +105,6 @@ Daemon which manages PIM.\n\n\
 -A, --vty_addr       Set vty's bind address\n\
 -P, --vty_port       Set vty's port number\n\
 -v, --version        Print program version\n\
-"
-
-#ifdef PIM_ZCLIENT_DEBUG
-"\
--Z, --debug_zclient  Enable zclient debugging\n\
-"
-#endif
-
-"\
 -h, --help           Display this help and exit\n\
 \n\
 Report bugs to %s\n", progname, PACKAGE_BUGREPORT);
@@ -182,11 +169,6 @@ int main(int argc, char** argv, char** envp) {
       print_version(QUAGGA_PROGNAME);
       exit (0);
       break;
-#ifdef PIM_ZCLIENT_DEBUG
-    case 'Z':
-      zclient_debug = 1;
-      break;
-#endif
     case 'h':
       usage (0);
       break;
@@ -263,11 +245,6 @@ int main(int argc, char** argv, char** envp) {
   PIM_DO_DEBUG_ZEBRA;
 #endif
 
-#ifdef PIM_ZCLIENT_DEBUG
-  zlog_notice("PIM_ZCLIENT_DEBUG: zclient debugging is supported, mode is %s (see option -Z)",
-	      zclient_debug ? "ON" : "OFF");
-#endif
-
 #ifdef PIM_CHECK_RECV_IFINDEX_SANITY
   zlog_notice("PIM_CHECK_RECV_IFINDEX_SANITY: will match sock/recv ifindex");
 #ifdef PIM_REPORT_RECV_IFINDEX_MISMATCH
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index 1ed724d7de..f3193b28db 100644
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -38,8 +38,6 @@
 #include "pim_oil.h"
 #include "pim_zlookup.h"
 
-extern int zclient_debug;
-
 static struct zclient *zlookup = NULL;
 
 static void zclient_lookup_sched(struct zclient *zlookup, int delay);