Merge pull request #13113 from sri-mohan1/sri-mohan-ldp

ldpd: changes for code maintainability

diff --cc ldpd/ldp_zebra.c
index 02cd1678e9b6d56dd4cabaa682b4da13b5ecb0ed,7d2bb03d0f083892025180d187fac8f75664614f..e3ace305822bf4facb73f81d725048a4f15aa9b5
--- 1/ldpd/ldp_zebra.c
--- 2/ldpd/ldp_zebra.c
+++ b/ldpd/ldp_zebra.c
@@@ -580,10 -591,10 +577,10 @@@ ldp_zebra_read_route(ZAPI_CALLBACK_ARGS
                        kr.ifindex = api_nh->ifindex;
                        break;
                case NEXTHOP_TYPE_IFINDEX:
-                       if (!(kr.flags & F_CONNECTED))
+                       if (!CHECK_FLAG(kr.flags, F_CONNECTED))
                                continue;
                        break;
 -              default:
 +              case NEXTHOP_TYPE_BLACKHOLE:
                        continue;
                }
  
@@@ -690,10 -698,10 +684,9 @@@ static zclient_handler *const ldp_handl
        [ZEBRA_OPAQUE_MESSAGE] = ldp_zebra_opaque_msg_handler,
  };
  
 -void
 -ldp_zebra_init(struct thread_master *master)
 +void ldp_zebra_init(struct event_loop *master)
  {
-       if_zapi_callbacks(ldp_ifp_create, ldp_ifp_up,
-                         ldp_ifp_down, ldp_ifp_destroy);
+       if_zapi_callbacks(ldp_ifp_create, ldp_ifp_up, ldp_ifp_down, ldp_ifp_destroy);
  
        /* Set default values. */
        zclient = zclient_new(master, &zclient_options_default, ldp_handlers,