diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-02-02 10:30:03 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-02-02 13:09:00 +0100 |
| commit | d9c30894a1cb3d0814ba281dd6e9f5ca63c987d5 (patch) | |
| tree | e9e89cb174ef0c04218f8c1b4481d3ce1b15f999 /source4/smbd | |
| parent | 1441e87e249190bd9fea72773b8fd014a05f9861 (diff) | |
| download | samba-d9c30894a1cb3d0814ba281dd6e9f5ca63c987d5.tar.gz samba-d9c30894a1cb3d0814ba281dd6e9f5ca63c987d5.tar.bz2 samba-d9c30894a1cb3d0814ba281dd6e9f5ca63c987d5.zip | |
s4:service_stream: s/private/private_data
metze
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/service_named_pipe.c | 12 | ||||
| -rw-r--r-- | source4/smbd/service_stream.c | 4 | ||||
| -rw-r--r-- | source4/smbd/service_stream.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source4/smbd/service_named_pipe.c b/source4/smbd/service_named_pipe.c index ffa4072392..de4726e4d5 100644 --- a/source4/smbd/service_named_pipe.c +++ b/source4/smbd/service_named_pipe.c @@ -60,8 +60,8 @@ static void named_pipe_handover_connection(void *private_data) /* * remove the named_pipe layer together with its packet layer */ - conn->ops = pipe_conn->pipe_sock->ops; - conn->private = pipe_conn->pipe_sock->private_data; + conn->ops = pipe_conn->pipe_sock->ops; + conn->private_data = pipe_conn->pipe_sock->private_data; talloc_free(pipe_conn); /* we're now ready to start receiving events on this stream */ @@ -209,7 +209,7 @@ reply: static void named_pipe_recv(struct stream_connection *conn, uint16_t flags) { struct named_pipe_connection *pipe_conn = talloc_get_type( - conn->private, struct named_pipe_connection); + conn->private_data, struct named_pipe_connection); DEBUG(10,("named_pipe_recv\n")); @@ -222,7 +222,7 @@ static void named_pipe_recv(struct stream_connection *conn, uint16_t flags) static void named_pipe_send(struct stream_connection *conn, uint16_t flags) { struct named_pipe_connection *pipe_conn = talloc_get_type( - conn->private, struct named_pipe_connection); + conn->private_data, struct named_pipe_connection); packet_queue_run(pipe_conn->packet); } @@ -262,7 +262,7 @@ static NTSTATUS named_pipe_full_request(void *private_data, DATA_BLOB blob, size static void named_pipe_accept(struct stream_connection *conn) { struct named_pipe_socket *pipe_sock = talloc_get_type( - conn->private, struct named_pipe_socket); + conn->private_data, struct named_pipe_socket); struct named_pipe_connection *pipe_conn; DEBUG(5,("named_pipe_accept\n")); @@ -291,7 +291,7 @@ static void named_pipe_accept(struct stream_connection *conn) pipe_conn->pipe_sock = pipe_sock; pipe_conn->connection = conn; - conn->private = pipe_conn; + conn->private_data = pipe_conn; } static const struct stream_server_ops named_pipe_stream_ops = { diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index fe07dc5a38..e09ac1d9e6 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -136,7 +136,7 @@ NTSTATUS stream_new_connection_merge(struct tevent_context *ev, talloc_steal(srv_conn, sock); - srv_conn->private = private_data; + srv_conn->private_data = private_data; srv_conn->model_ops = model_ops; srv_conn->socket = sock; srv_conn->server_id = cluster_id(0, 0); @@ -177,7 +177,7 @@ static void stream_new_connection(struct tevent_context *ev, talloc_steal(srv_conn, sock); - srv_conn->private = stream_socket->private_data; + srv_conn->private_data = stream_socket->private_data; srv_conn->model_ops = stream_socket->model_ops; srv_conn->socket = sock; srv_conn->server_id = server_id; diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h index 078887bf14..5d577d4dd8 100644 --- a/source4/smbd/service_stream.h +++ b/source4/smbd/service_stream.h @@ -39,7 +39,7 @@ struct stream_connection { const struct stream_server_ops *ops; const struct model_ops *model_ops; struct server_id server_id; - void *private; + void *private_data; struct { struct tevent_context *ctx; |