pimd: Remove pim_msdp_config_write as it was never used

This function was never used, additionally rename the _helper
function to this name.

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

diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 7e072e6ade4037b594b4e9daf47e9f62a1f0406f..a4f87fa1a65c36d68e8530af18939091d6d6cbd3 100644 (file)
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -1523,8 +1523,8 @@ enum pim_msdp_err pim_msdp_mg_src_add(struct pim_instance *pim,
 }
 
 /*********************** MSDP feature APIs *********************************/
-int pim_msdp_config_write_helper(struct pim_instance *pim, struct vty *vty,
-                                const char *spaces)
+int pim_msdp_config_write(struct pim_instance *pim, struct vty *vty,
+                         const char *spaces)
 {
        struct listnode *mbrnode;
        struct pim_msdp_mg_mbr *mbr;
@@ -1553,11 +1553,6 @@ int pim_msdp_config_write_helper(struct pim_instance *pim, struct vty *vty,
        return count;
 }
 
-int pim_msdp_config_write(struct vty *vty)
-{
-       return pim_msdp_config_write_helper(pimg, vty, "");
-}
-
 /* Enable feature including active/periodic timers etc. on the first peer
  * config. Till then MSDP should just stay quiet. */
 static void pim_msdp_enable(struct pim_instance *pim)

diff --git a/pimd/pim_msdp.h b/pimd/pim_msdp.h
index 8363d509915ac7953c9a7a2419501386cda24bbe..6caa3181e72043d7683c792b7400e3d8e58df4b1 100644 (file)
--- a/pimd/pim_msdp.h
+++ b/pimd/pim_msdp.h
@@ -232,9 +232,8 @@ void pim_msdp_peer_reset_tcp_conn(struct pim_msdp_peer *mp, const char *rc_str);
 int pim_msdp_write(struct thread *thread);
 char *pim_msdp_peer_key_dump(struct pim_msdp_peer *mp, char *buf, int buf_size,
                             bool long_format);
-int pim_msdp_config_write(struct vty *vty);
-int pim_msdp_config_write_helper(struct pim_instance *pim, struct vty *vty,
-                                const char *spaces);
+int pim_msdp_config_write(struct pim_instance *pim, struct vty *vty,
+                         const char *spaces);
 void pim_msdp_peer_pkt_txed(struct pim_msdp_peer *mp);
 void pim_msdp_sa_ref(struct pim_instance *pim, struct pim_msdp_peer *mp,
                     struct prefix_sg *sg, struct in_addr rp);

diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 56227956f50abddd78de84c9910ac130d3f5cd2c..f6385a0ac9ef7ca214d1fffe14f4ff03eb4c58a2 100644 (file)
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -163,7 +163,7 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
        else
                sprintf(spaces, "%s", " ");
 
-       writes += pim_msdp_config_write_helper(pim, vty, spaces);
+       writes += pim_msdp_config_write(pim, vty, spaces);
 
        if (!pim->send_v6_secondary) {
                vty_out(vty, "%sno ip pim send-v6-secondary\n", spaces);