summaryrefslogtreecommitdiff
path: root/source4/libcli/raw
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-31 08:30:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:25 -0500
commit9a70f446fc4abc2bd1278772810c0e8132f4bea4 (patch)
treeb9baaa7b19c88afaa26f0cd0a35201fb5c433a3d /source4/libcli/raw
parent58d6c73e946d11574a6220f37887e1cdfe05f525 (diff)
downloadsamba-9a70f446fc4abc2bd1278772810c0e8132f4bea4.tar.gz
samba-9a70f446fc4abc2bd1278772810c0e8132f4bea4.tar.bz2
samba-9a70f446fc4abc2bd1278772810c0e8132f4bea4.zip
r5126: the composite code is no longer client specific or smb specific, so
rename the core structure to composite_context and the wait routine to composite_wait() (suggestion from metze) (This used to be commit cf11d05e35179c2c3e51c5ab370cd0a3fb15f24a)
Diffstat (limited to 'source4/libcli/raw')
-rw-r--r--source4/libcli/raw/clisocket.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index c9934fa16d..78a096fb8f 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -74,7 +74,7 @@ static NTSTATUS smbcli_sock_connect_one(struct smbcli_socket *sock,
static void smbcli_sock_connect_handler(struct event_context *ev, struct fd_event *fde,
struct timeval t, uint16_t flags)
{
- struct smbcli_composite *c = talloc_get_type(fde->private, struct smbcli_composite);
+ struct composite_context *c = talloc_get_type(fde->private, struct composite_context);
struct clisocket_connect *conn = talloc_get_type(c->private, struct clisocket_connect);
int i;
@@ -153,14 +153,14 @@ static NTSTATUS smbcli_sock_connect_one(struct smbcli_socket *sock,
this is the async send side of the interface
*/
-struct smbcli_composite *smbcli_sock_connect_send(struct smbcli_socket *sock,
+struct composite_context *smbcli_sock_connect_send(struct smbcli_socket *sock,
const char *host_addr, int port)
{
- struct smbcli_composite *c;
+ struct composite_context *c;
struct clisocket_connect *conn;
int i;
- c = talloc_zero(sock, struct smbcli_composite);
+ c = talloc_zero(sock, struct composite_context);
if (c == NULL) return NULL;
c->event_ctx = sock->event.ctx;
@@ -219,10 +219,10 @@ failed:
/*
finish a smbcli_sock_connect_send() operation
*/
-NTSTATUS smbcli_sock_connect_recv(struct smbcli_composite *c)
+NTSTATUS smbcli_sock_connect_recv(struct composite_context *c)
{
NTSTATUS status;
- status = smb_composite_wait(c);
+ status = composite_wait(c);
talloc_free(c);
return status;
}
@@ -235,7 +235,7 @@ NTSTATUS smbcli_sock_connect_recv(struct smbcli_composite *c)
*/
NTSTATUS smbcli_sock_connect(struct smbcli_socket *sock, const char *host_addr, int port)
{
- struct smbcli_composite *c;
+ struct composite_context *c;
c = smbcli_sock_connect_send(sock, host_addr, port);
if (c == NULL) {