svn commit: samba r4791 - in branches/SAMBA_4_0/source/libcli:
composite raw
tridge at samba.org
tridge at samba.org
Sun Jan 16 23:23:45 GMT 2005
Author: tridge
Date: 2005-01-16 23:23:45 +0000 (Sun, 16 Jan 2005)
New Revision: 4791
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4791
Log:
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.
Modified:
branches/SAMBA_4_0/source/libcli/composite/connect.c
branches/SAMBA_4_0/source/libcli/composite/loadfile.c
branches/SAMBA_4_0/source/libcli/composite/savefile.c
branches/SAMBA_4_0/source/libcli/composite/sesssetup.c
branches/SAMBA_4_0/source/libcli/raw/clisocket.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/composite/connect.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/composite/connect.c 2005-01-16 23:21:52 UTC (rev 4790)
+++ branches/SAMBA_4_0/source/libcli/composite/connect.c 2005-01-16 23:23:45 UTC (rev 4791)
@@ -53,7 +53,7 @@
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_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_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_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_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_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 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 @@
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);
}
Modified: branches/SAMBA_4_0/source/libcli/composite/loadfile.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/composite/loadfile.c 2005-01-16 23:21:52 UTC (rev 4790)
+++ branches/SAMBA_4_0/source/libcli/composite/loadfile.c 2005-01-16 23:23:45 UTC (rev 4791)
@@ -45,7 +45,7 @@
static NTSTATUS setup_close(struct smbcli_composite *c,
struct smbcli_tree *tree, uint16_t fnum)
{
- struct loadfile_state *state = c->private;
+ struct loadfile_state *state = talloc_get_type(c->private, struct loadfile_state);
union smb_close *io_close;
/* nothing to read, setup the close */
@@ -74,7 +74,7 @@
static NTSTATUS loadfile_open(struct smbcli_composite *c,
struct smb_composite_loadfile *io)
{
- struct loadfile_state *state = c->private;
+ struct loadfile_state *state = talloc_get_type(c->private, struct loadfile_state);
struct smbcli_tree *tree = state->req->tree;
NTSTATUS status;
@@ -128,7 +128,7 @@
static NTSTATUS loadfile_read(struct smbcli_composite *c,
struct smb_composite_loadfile *io)
{
- struct loadfile_state *state = c->private;
+ struct loadfile_state *state = talloc_get_type(c->private, struct loadfile_state);
struct smbcli_tree *tree = state->req->tree;
NTSTATUS status;
@@ -162,7 +162,7 @@
static NTSTATUS loadfile_close(struct smbcli_composite *c,
struct smb_composite_loadfile *io)
{
- struct loadfile_state *state = c->private;
+ struct loadfile_state *state = talloc_get_type(c->private, struct loadfile_state);
NTSTATUS status;
status = smbcli_request_simple_recv(state->req);
@@ -183,7 +183,7 @@
static void loadfile_handler(struct smbcli_request *req)
{
struct smbcli_composite *c = req->async.private;
- struct loadfile_state *state = c->private;
+ struct loadfile_state *state = talloc_get_type(c->private, struct loadfile_state);
/* when this handler is called, the stage indicates what
call has just finished */
@@ -271,7 +271,7 @@
status = smb_composite_wait(c);
if (NT_STATUS_IS_OK(status)) {
- struct loadfile_state *state = c->private;
+ struct loadfile_state *state = talloc_get_type(c->private, struct loadfile_state);
talloc_steal(mem_ctx, state->io->out.data);
}
Modified: branches/SAMBA_4_0/source/libcli/composite/savefile.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/composite/savefile.c 2005-01-16 23:21:52 UTC (rev 4790)
+++ branches/SAMBA_4_0/source/libcli/composite/savefile.c 2005-01-16 23:23:45 UTC (rev 4791)
@@ -47,7 +47,7 @@
static NTSTATUS setup_close(struct smbcli_composite *c,
struct smbcli_tree *tree, uint16_t fnum)
{
- struct savefile_state *state = c->private;
+ struct savefile_state *state = talloc_get_type(c->private, struct savefile_state);
union smb_close *io_close;
/* nothing to write, setup the close */
@@ -76,7 +76,7 @@
static NTSTATUS savefile_open(struct smbcli_composite *c,
struct smb_composite_savefile *io)
{
- struct savefile_state *state = c->private;
+ struct savefile_state *state = talloc_get_type(c->private, struct savefile_state);
union smb_write *io_write;
struct smbcli_tree *tree = state->req->tree;
NTSTATUS status;
@@ -122,7 +122,7 @@
static NTSTATUS savefile_write(struct smbcli_composite *c,
struct smb_composite_savefile *io)
{
- struct savefile_state *state = c->private;
+ struct savefile_state *state = talloc_get_type(c->private, struct savefile_state);
struct smbcli_tree *tree = state->req->tree;
NTSTATUS status;
uint32_t max_xmit = tree->session->transport->negotiate.max_xmit;
@@ -160,7 +160,7 @@
static NTSTATUS savefile_close(struct smbcli_composite *c,
struct smb_composite_savefile *io)
{
- struct savefile_state *state = c->private;
+ struct savefile_state *state = talloc_get_type(c->private, struct savefile_state);
NTSTATUS status;
status = smbcli_request_simple_recv(state->req);
@@ -185,7 +185,7 @@
static void savefile_handler(struct smbcli_request *req)
{
struct smbcli_composite *c = req->async.private;
- struct savefile_state *state = c->private;
+ struct savefile_state *state = talloc_get_type(c->private, struct savefile_state);
/* when this handler is called, the stage indicates what
call has just finished */
Modified: branches/SAMBA_4_0/source/libcli/composite/sesssetup.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/composite/sesssetup.c 2005-01-16 23:21:52 UTC (rev 4790)
+++ branches/SAMBA_4_0/source/libcli/composite/sesssetup.c 2005-01-16 23:23:45 UTC (rev 4791)
@@ -94,7 +94,7 @@
static void request_handler(struct smbcli_request *req)
{
struct smbcli_composite *c = req->async.private;
- struct sesssetup_state *state = c->private;
+ struct sesssetup_state *state = talloc_get_type(c->private, struct sesssetup_state);
struct smbcli_session *session = req->session;
DATA_BLOB session_key = data_blob(NULL, 0);
DATA_BLOB null_data_blob = data_blob(NULL, 0);
@@ -168,7 +168,7 @@
struct smbcli_session *session,
struct smb_composite_sesssetup *io)
{
- struct sesssetup_state *state = c->private;
+ struct sesssetup_state *state = talloc_get_type(c->private, struct sesssetup_state);
state->setup.nt1.level = RAW_SESSSETUP_NT1;
state->setup.nt1.in.bufsize = session->transport->options.max_xmit;
@@ -207,7 +207,7 @@
struct smbcli_session *session,
struct smb_composite_sesssetup *io)
{
- struct sesssetup_state *state = c->private;
+ struct sesssetup_state *state = talloc_get_type(c->private, struct sesssetup_state);
state->setup.old.level = RAW_SESSSETUP_OLD;
state->setup.old.in.bufsize = session->transport->options.max_xmit;
@@ -241,7 +241,7 @@
struct smbcli_session *session,
struct smb_composite_sesssetup *io)
{
- struct sesssetup_state *state = c->private;
+ struct sesssetup_state *state = talloc_get_type(c->private, struct sesssetup_state);
NTSTATUS status;
DATA_BLOB session_key = data_blob(NULL, 0);
DATA_BLOB null_data_blob = data_blob(NULL, 0);
Modified: branches/SAMBA_4_0/source/libcli/raw/clisocket.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/clisocket.c 2005-01-16 23:21:52 UTC (rev 4790)
+++ branches/SAMBA_4_0/source/libcli/raw/clisocket.c 2005-01-16 23:23:45 UTC (rev 4791)
@@ -66,8 +66,8 @@
static void smbcli_sock_connect_handler(struct event_context *ev, struct fd_event *fde,
struct timeval t, uint16_t flags)
{
- struct smbcli_composite *c = fde->private;
- struct clisocket_connect *conn = c->private;
+ struct smbcli_composite *c = talloc_get_type(fde->private, struct smbcli_composite);
+ struct clisocket_connect *conn = talloc_get_type(c->private, struct clisocket_connect);
int i;
c->status = socket_connect_complete(conn->sock->sock, 0);
More information about the samba-cvs
mailing list