summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-02 09:56:47 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-02 13:08:49 +0100
commit476aa1f00d298bdbefd92ba9505109167e3dfa1e (patch)
tree84bc370502c7c8c23239a25e69c010025280bbe8
parente08dfe008e63789347cf7dc360b70ba1a1cb5b20 (diff)
downloadsamba-476aa1f00d298bdbefd92ba9505109167e3dfa1e.tar.gz
samba-476aa1f00d298bdbefd92ba9505109167e3dfa1e.tar.bz2
samba-476aa1f00d298bdbefd92ba9505109167e3dfa1e.zip
s4:smb2: s/private/private_data
metze
-rw-r--r--source4/libcli/smb2/smb2.h2
-rw-r--r--source4/libcli/smb2/transport.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index 9d63a4a95f..d1d5b842c3 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -59,7 +59,7 @@ struct smb2_transport {
for a packet */
struct {
void (*func)(struct smb2_transport *, void *);
- void *private;
+ void *private_data;
uint_t period;
} idle;
diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index 679b085889..e112544c62 100644
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -390,7 +390,7 @@ static void idle_handler(struct tevent_context *ev,
transport,
next,
idle_handler, transport);
- transport->idle.func(transport, transport->idle.private);
+ transport->idle.func(transport, transport->idle.private_data);
}
/*
@@ -403,7 +403,7 @@ void smb2_transport_idle_handler(struct smb2_transport *transport,
void *private_data)
{
transport->idle.func = idle_func;
- transport->idle.private = private_data;
+ transport->idle.private_data = private_data;
transport->idle.period = period;
if (transport->socket->event.te != NULL) {