aboutsummaryrefslogtreecommitdiff
path: root/sunrpc
diff options
context:
space:
mode:
Diffstat (limited to 'sunrpc')
-rw-r--r--sunrpc/clnt_perr.c4
-rw-r--r--sunrpc/rpc_thread.c1
-rw-r--r--sunrpc/tst-svc_register.c6
3 files changed, 5 insertions, 6 deletions
diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c
index 67499fd03f..c3d13722df 100644
--- a/sunrpc/clnt_perr.c
+++ b/sunrpc/clnt_perr.c
@@ -389,8 +389,8 @@ auth_errmsg (enum auth_stat stat)
}
-libc_freeres_fn (free_mem)
+void
+__rpc_freemem (void)
{
- /* Not libc_freeres_ptr, since buf is a macro. */
free (buf);
}
diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
index 0abe6dc172..a04b7ec47f 100644
--- a/sunrpc/rpc_thread.c
+++ b/sunrpc/rpc_thread.c
@@ -37,7 +37,6 @@ __rpc_thread_destroy (void)
thread_rpc_vars = NULL;
}
}
-text_set_element (__libc_subfreeres, __rpc_thread_destroy);
/*
* Initialize RPC multi-threaded operation
diff --git a/sunrpc/tst-svc_register.c b/sunrpc/tst-svc_register.c
index 542c5c2a89..434a5bedef 100644
--- a/sunrpc/tst-svc_register.c
+++ b/sunrpc/tst-svc_register.c
@@ -276,9 +276,9 @@ do_test (void)
else
/* This is arguably a bug: Regular process termination
does not unregister the service with rpcbind. The
- unset rpcbind call happens from a __libc_subfreeres
- callback, and this only happens when running under
- memory debuggers such as valgrind. */
+ unset rpcbind call happens from a __libc_freeres,
+ and this only happens when running under memory debuggers
+ such as valgrind. */
TEST_VERIFY (!state.unset_called);
}
else