diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-01-16 23:23:45 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:55 -0500 |
commit | 4a03172e66694b51a24f7b5566f361c1f1767e29 (patch) | |
tree | c29ddb9ce94d84c8c6bcba7e0ea86a2fb4524c89 /source4/libcli/composite/connect.c | |
parent | 7b79694eadc288592729567c3caa7c70f6662760 (diff) | |
download | samba-4a03172e66694b51a24f7b5566f361c1f1767e29.tar.gz samba-4a03172e66694b51a24f7b5566f361c1f1767e29.tar.bz2 samba-4a03172e66694b51a24f7b5566f361c1f1767e29.zip |
r4791: used the new talloc type safety macros to make the "void *private"
pointers in the composite code type safe.
This is a bit of an experiement, I'd be interested in comments on
whether we should use this more widely.
(This used to be commit 0e1da827b380998355f75f4ef4f424802059c278)
Diffstat (limited to 'source4/libcli/composite/connect.c')
-rw-r--r-- | source4/libcli/composite/connect.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/libcli/composite/connect.c b/source4/libcli/composite/connect.c index bc39cc99fc..bdb1b4d263 100644 --- a/source4/libcli/composite/connect.c +++ b/source4/libcli/composite/connect.c @@ -53,7 +53,7 @@ static void composite_handler(struct smbcli_composite *); static NTSTATUS connect_send_negprot(struct smbcli_composite *c, struct smb_composite_connect *io) { - struct connect_state *state = c->private; + struct connect_state *state = talloc_get_type(c->private, struct connect_state); state->req = smb_raw_negotiate_send(state->transport, lp_maxprotocol()); NT_STATUS_HAVE_NO_MEMORY(state->req); @@ -72,7 +72,7 @@ static NTSTATUS connect_send_negprot(struct smbcli_composite *c, static NTSTATUS connect_tcon(struct smbcli_composite *c, struct smb_composite_connect *io) { - struct connect_state *state = c->private; + struct connect_state *state = talloc_get_type(c->private, struct connect_state); NTSTATUS status; status = smb_tree_connect_recv(state->req, c, state->io_tcon); @@ -104,7 +104,7 @@ static NTSTATUS connect_tcon(struct smbcli_composite *c, static NTSTATUS connect_session_setup(struct smbcli_composite *c, struct smb_composite_connect *io) { - struct connect_state *state = c->private; + struct connect_state *state = talloc_get_type(c->private, struct connect_state); NTSTATUS status; status = smb_composite_sesssetup_recv(state->creq); @@ -151,7 +151,7 @@ static NTSTATUS connect_session_setup(struct smbcli_composite *c, static NTSTATUS connect_negprot(struct smbcli_composite *c, struct smb_composite_connect *io) { - struct connect_state *state = c->private; + struct connect_state *state = talloc_get_type(c->private, struct connect_state); NTSTATUS status; status = smb_raw_negotiate_recv(state->req); @@ -191,7 +191,7 @@ static NTSTATUS connect_negprot(struct smbcli_composite *c, static NTSTATUS connect_session_request(struct smbcli_composite *c, struct smb_composite_connect *io) { - struct connect_state *state = c->private; + struct connect_state *state = talloc_get_type(c->private, struct connect_state); NTSTATUS status; status = smbcli_transport_connect_recv(state->req); @@ -207,7 +207,7 @@ static NTSTATUS connect_session_request(struct smbcli_composite *c, static NTSTATUS connect_socket(struct smbcli_composite *c, struct smb_composite_connect *io) { - struct connect_state *state = c->private; + struct connect_state *state = talloc_get_type(c->private, struct connect_state); NTSTATUS status; struct nmb_name calling, called; @@ -245,7 +245,7 @@ static NTSTATUS connect_socket(struct smbcli_composite *c, */ static void state_handler(struct smbcli_composite *c) { - struct connect_state *state = c->private; + struct connect_state *state = talloc_get_type(c->private, struct connect_state); switch (c->stage) { case CONNECT_SOCKET: @@ -338,7 +338,7 @@ NTSTATUS smb_composite_connect_recv(struct smbcli_composite *c, TALLOC_CTX *mem_ status = smb_composite_wait(c); if (NT_STATUS_IS_OK(status)) { - struct connect_state *state = c->private; + struct connect_state *state = talloc_get_type(c->private, struct connect_state); talloc_steal(mem_ctx, state->io->out.tree); } |