From: Andrew Deason Date: Tue, 3 Nov 2020 19:49:15 +0000 (-0600) Subject: rx: Remove multi_End_Ignore X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=e1f42913419cc51348e9e42a752e0816a8d8f610;hp=002b031d01e3c0f2ad3e1069b98800c3a7228bd5 rx: Remove multi_End_Ignore Since commit "rx: Remove delays in multi_End_Ignore", multi_End_Ignore and multi_Finalize_Ignore are unused in the tree, and should not be used by callers. Remove the dead functions. This commit bumps LT_current in libafsrpc to 3, because we are removing the exported symbol multi_Finalize_Ignore. Change-Id: I4d298f5118a69cfd04de44c3f268691a87a6d9a7 Reviewed-on: https://gerrit.openafs.org/14425 Reviewed-by: Benjamin Kaduk Tested-by: BuildBot --- diff --git a/src/libafsrpc/Makefile.in b/src/libafsrpc/Makefile.in index b451e7e..6a1c1bc 100644 --- a/src/libafsrpc/Makefile.in +++ b/src/libafsrpc/Makefile.in @@ -11,7 +11,7 @@ include @TOP_OBJDIR@/src/config/Makefile.libtool # Increment these according to libtool's versioning rules (look them up!) # The library output looks like libafsrpc.so.. -LT_current = 2 +LT_current = 3 LT_revision = 0 LT_age = 0 diff --git a/src/libafsrpc/afsrpc.def b/src/libafsrpc/afsrpc.def index 631fe01..33d8e34 100755 --- a/src/libafsrpc/afsrpc.def +++ b/src/libafsrpc/afsrpc.def @@ -84,7 +84,7 @@ EXPORTS multi_Finalize @96 multi_Select @97 multi_Init @98 - multi_Finalize_Ignore @99 +; multi_Finalize_Ignore @99 afs_add_to_error_table @100 xdr_afsUUID @101 rx_GetSpecific @102 diff --git a/src/libafsrpc/libafsrpc.la.sym b/src/libafsrpc/libafsrpc.la.sym index 05583ae..48de1ec 100644 --- a/src/libafsrpc/libafsrpc.la.sym +++ b/src/libafsrpc/libafsrpc.la.sym @@ -35,7 +35,6 @@ initialize_RXK_error_table ktohl life_to_time multi_Finalize -multi_Finalize_Ignore multi_Init multi_Select opr_AssertionFailed diff --git a/src/rx/liboafs_rx.la.sym b/src/rx/liboafs_rx.la.sym index 90c2263..2247d41 100644 --- a/src/rx/liboafs_rx.la.sym +++ b/src/rx/liboafs_rx.la.sym @@ -16,7 +16,6 @@ afs_xdr_vector afs_xdrmem_create hton_syserr_conv multi_Finalize -multi_Finalize_Ignore multi_Init multi_Select osi_AssertFailU diff --git a/src/rx/rx_multi.c b/src/rx/rx_multi.c index 7c79767..7e9f07c 100644 --- a/src/rx/rx_multi.c +++ b/src/rx/rx_multi.c @@ -120,10 +120,3 @@ multi_Finalize(struct multi_handle *mh) osi_Free(mh->ready, sizeof(short) * nCalls); osi_Free(mh, sizeof(struct multi_handle)); } - -/* Deprecated; use multi_Finalize() instead. */ -void -multi_Finalize_Ignore(struct multi_handle *mh) -{ - multi_Finalize(mh); -} diff --git a/src/rx/rx_multi.h b/src/rx/rx_multi.h index 80bf1ec..5f6a4db 100644 --- a/src/rx/rx_multi.h +++ b/src/rx/rx_multi.h @@ -54,7 +54,4 @@ struct multi_handle { multi_Finalize(multi_h);\ } while (0) -/* Deprecated; use multi_End instead. */ -#define multi_End_Ignore multi_End - #endif /* _RX_MULTI_ End of rx_multi.h */ diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index f8dbbe1..23d04ee 100644 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -371,7 +371,6 @@ extern int multi_Select(struct multi_handle *mh); extern void multi_Ready(struct rx_call *call, void *mh, int index); extern void multi_Finalize(struct multi_handle *mh); -extern void multi_Finalize_Ignore(struct multi_handle *mh);