summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-10 11:56:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:59:22 -0500
commit8f9922863f5c50037ceb9614a57b858be70a9bd0 (patch)
tree46d5ed9d22951a436e89518ba66b2d28d308301f
parentd57cb82663990dbad7a3b83b86cbc21ca96a9350 (diff)
downloadsamba-8f9922863f5c50037ceb9614a57b858be70a9bd0.tar.gz
samba-8f9922863f5c50037ceb9614a57b858be70a9bd0.tar.bz2
samba-8f9922863f5c50037ceb9614a57b858be70a9bd0.zip
r23812: Remove more code found as dead by the find_static script, and make
other functions just static. Andrew Bartlett (This used to be commit 64fcec1da613dc8f16f0fba02fb3de0ec840671f)
-rw-r--r--source4/librpc/rpc/dcerpc_sock.c47
1 files changed, 4 insertions, 43 deletions
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index 13d6c9980d..a5abf9b4be 100644
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -300,7 +300,7 @@ static void continue_socket_connect(struct composite_context *ctx)
}
-struct composite_context *dcerpc_pipe_open_socket_send(TALLOC_CTX *mem_ctx,
+static struct composite_context *dcerpc_pipe_open_socket_send(TALLOC_CTX *mem_ctx,
struct dcerpc_connection *cn,
struct socket_address *server,
const char *target_hostname,
@@ -337,7 +337,7 @@ struct composite_context *dcerpc_pipe_open_socket_send(TALLOC_CTX *mem_ctx,
}
-NTSTATUS dcerpc_pipe_open_socket_recv(struct composite_context *c)
+static NTSTATUS dcerpc_pipe_open_socket_recv(struct composite_context *c)
{
NTSTATUS status = composite_wait(c);
@@ -345,21 +345,6 @@ NTSTATUS dcerpc_pipe_open_socket_recv(struct composite_context *c)
return status;
}
-/*
- open a rpc connection using the generic socket library
-*/
-NTSTATUS dcerpc_pipe_open_socket(struct dcerpc_connection *conn,
- struct socket_address *server,
- const char *target_hostname,
- enum dcerpc_transport_t transport)
-{
- struct composite_context *c;
-
- c = dcerpc_pipe_open_socket_send(conn, conn, server, target_hostname, transport);
- return dcerpc_pipe_open_socket_recv(c);
-}
-
-
struct pipe_tcp_state {
const char *server;
const char *target_hostname;
@@ -510,20 +495,6 @@ NTSTATUS dcerpc_pipe_open_tcp_recv(struct composite_context *c)
}
-/*
- Open rpc pipe on tcp/ip transport - sync version
-*/
-NTSTATUS dcerpc_pipe_open_tcp(struct dcerpc_connection *conn, const char *server,
- const char *target_hostname,
- uint32_t port)
-{
- struct composite_context *c;
-
- c = dcerpc_pipe_open_tcp_send(conn, server, target_hostname, port);
- return dcerpc_pipe_open_tcp_recv(c);
-}
-
-
struct pipe_unix_state {
const char *path;
struct socket_address *srvaddr;
@@ -535,7 +506,7 @@ struct pipe_unix_state {
Stage 2 of dcerpc_pipe_open_unix_stream_send: receive result of pipe open
request on unix socket.
*/
-void continue_unix_open_socket(struct composite_context *ctx)
+static void continue_unix_open_socket(struct composite_context *ctx)
{
struct composite_context *c = talloc_get_type(ctx->async.private_data,
struct composite_context);
@@ -598,16 +569,6 @@ NTSTATUS dcerpc_pipe_open_unix_stream_recv(struct composite_context *c)
}
-/*
- Open a rpc pipe on a unix socket - sync version
-*/
-NTSTATUS dcerpc_pipe_open_unix_stream(struct dcerpc_connection *conn, const char *path)
-{
- struct composite_context *c = dcerpc_pipe_open_unix_stream_send(conn, path);
- return dcerpc_pipe_open_unix_stream_recv(c);
-}
-
-
struct pipe_np_state {
char *full_path;
struct socket_address *srvaddr;
@@ -618,7 +579,7 @@ struct pipe_np_state {
/*
Stage 2 of dcerpc_pipe_open_pipe_send: receive socket open request
*/
-void continue_np_open_socket(struct composite_context *ctx)
+static void continue_np_open_socket(struct composite_context *ctx)
{
struct composite_context *c = talloc_get_type(ctx->async.private_data,
struct composite_context);