From f66cac4f357e08da52dde48cbfaeaa78b6e66e1c Mon Sep 17 00:00:00 2001 From: "James R. Leu" Date: Wed, 26 Feb 2003 13:04:55 -0600 Subject: [PATCH] I changed all of the porting layer verify and compare routines to be macros which are implemented in mpls_handle_type.h Fix some of the socket implementation to differenciate from EGAIN and other errors [git-p4: depot-paths = "//depot/ldp-portable/": change = 299] --- common/mpls_fib_impl.h | 6 ------ common/mpls_ifmgr_impl.h | 16 ---------------- common/mpls_lock_impl.h | 6 ------ common/mpls_mpls_impl.h | 6 ------ common/mpls_socket_impl.h | 13 ------------- common/mpls_timer_impl.h | 13 ------------- common/mpls_tree_impl.h | 6 ------ 7 files changed, 66 deletions(-) diff --git a/common/mpls_fib_impl.h b/common/mpls_fib_impl.h index 42ee3cd..72008e8 100644 --- a/common/mpls_fib_impl.h +++ b/common/mpls_fib_impl.h @@ -13,12 +13,6 @@ #include "mpls_struct.h" /* - * in: handle - * return: mpls_bool - */ -extern mpls_bool mpls_fib_handle_verify(mpls_fib_handle handle); - -/* * in: handle, cfg, callback, * return: mpls_fib_handle */ diff --git a/common/mpls_ifmgr_impl.h b/common/mpls_ifmgr_impl.h index d0e119c..2e3c3fd 100644 --- a/common/mpls_ifmgr_impl.h +++ b/common/mpls_ifmgr_impl.h @@ -16,19 +16,6 @@ #include "mpls_handle_type.h" /* - * in: handle - * return: mpls_bool - */ -extern mpls_bool mpls_ifmgr_handle_verify(mpls_ifmgr_handle handle); - -/* - * in: handle,iff - * return: mpls_bool - */ -extern mpls_bool mpls_if_handle_verify(const mpls_ifmgr_handle handle, - mpls_if_handle iff); - -/* * in: handle,cfg,callback * return: mpls_ifmgr_handle */ @@ -83,7 +70,4 @@ extern mpls_return_enum mpls_ifmgr_getfirst_address(const mpls_ifmgr_handle, extern mpls_return_enum mpls_ifmgr_getnext_address(const mpls_ifmgr_handle, mpls_if_handle*, mpls_inet_addr*); -extern int mpls_if_handle_compare(mpls_ifmgr_handle ifmgr_handle, mpls_if_handle a, mpls_if_handle b); - - #endif diff --git a/common/mpls_lock_impl.h b/common/mpls_lock_impl.h index e7b9866..e73db30 100644 --- a/common/mpls_lock_impl.h +++ b/common/mpls_lock_impl.h @@ -13,12 +13,6 @@ #include "mpls_struct.h" /* - * in: handle - * return: mpls_bool - */ -extern mpls_bool mpls_lock_handle_verify(mpls_lock_handle handle); - -/* * in: key * return: mpls_lock_handle */ diff --git a/common/mpls_mpls_impl.h b/common/mpls_mpls_impl.h index 332cbe8..e19398e 100644 --- a/common/mpls_mpls_impl.h +++ b/common/mpls_mpls_impl.h @@ -17,12 +17,6 @@ struct ldp_outlabel; /* * in: handle - * return: mpls_bool - */ -extern mpls_bool mpls_mpls_handle_verify(mpls_mpls_handle handle); - -/* - * in: handle * return: mpls_mpls_handle */ extern mpls_mpls_handle mpls_mpls_open(mpls_instance_handle handle); diff --git a/common/mpls_socket_impl.h b/common/mpls_socket_impl.h index ee52149..bd436fc 100644 --- a/common/mpls_socket_impl.h +++ b/common/mpls_socket_impl.h @@ -14,19 +14,6 @@ /* * in: handle - * return: mpls_bool - */ -extern mpls_bool mpls_socket_mgr_handle_verify(mpls_socket_mgr_handle handle); - -/* - * in: handle, socket - * return: mpls_bool - */ -extern mpls_bool mpls_socket_handle_verify(mpls_socket_mgr_handle handle, - mpls_socket_handle socket); - -/* - * in: handle * return: mpls_socket_mgr_handle */ extern mpls_socket_mgr_handle mpls_socket_mgr_open(const mpls_instance_handle diff --git a/common/mpls_timer_impl.h b/common/mpls_timer_impl.h index 6aa894b..6058397 100644 --- a/common/mpls_timer_impl.h +++ b/common/mpls_timer_impl.h @@ -14,19 +14,6 @@ /* * in: handle - * return: mpls_bool - */ -extern mpls_bool mpls_timer_mgr_handle_verify(mpls_timer_mgr_handle handle); - -/* - * in: handle, timer - * return: mpls_bool - */ -extern mpls_bool mpls_timer_handle_verify(mpls_timer_mgr_handle handle, - mpls_timer_handle timer); - -/* - * in: handle * return: mpls_timer_mgr_handle */ extern mpls_timer_mgr_handle mpls_timer_open(mpls_instance_handle handle); diff --git a/common/mpls_tree_impl.h b/common/mpls_tree_impl.h index c5bd2a1..5d89c63 100644 --- a/common/mpls_tree_impl.h +++ b/common/mpls_tree_impl.h @@ -13,12 +13,6 @@ #include "mpls_struct.h" /* - * in: mpls_tree_handle - * return: mpls_bool - */ -extern mpls_bool mpls_tree_handle_verify(mpls_tree_handle handle); - -/* * in: depth * return: mpls_tree_handle */ -- 2.11.4.GIT