summaryrefslogtreecommitdiff
path: root/source4/libcli/smb2
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-12-29 20:24:57 +0100
committerStefan Metzmacher <metze@samba.org>2008-12-29 20:46:40 +0100
commit183c379fe58ca60f5ef2d1f2033d035d4117ac8f (patch)
treed68d3895f1e79b96c3af2c80cac6a403a1a180d4 /source4/libcli/smb2
parentaf29b82536ef678e6a1817aa11be8c363253b305 (diff)
downloadsamba-183c379fe58ca60f5ef2d1f2033d035d4117ac8f.tar.gz
samba-183c379fe58ca60f5ef2d1f2033d035d4117ac8f.tar.bz2
samba-183c379fe58ca60f5ef2d1f2033d035d4117ac8f.zip
s4:lib/tevent: rename structs
list="" list="$list event_context:tevent_context" list="$list fd_event:tevent_fd" list="$list timed_event:tevent_timer" for s in $list; do o=`echo $s | cut -d ':' -f1` n=`echo $s | cut -d ':' -f2` r=`git grep "struct $o" |cut -d ':' -f1 |sort -u` files=`echo "$r" | grep -v source3 | grep -v nsswitch | grep -v packaging4` for f in $files; do cat $f | sed -e "s/struct $o/struct $n/g" > $f.tmp mv $f.tmp $f done done metze
Diffstat (limited to 'source4/libcli/smb2')
-rw-r--r--source4/libcli/smb2/connect.c4
-rw-r--r--source4/libcli/smb2/smb2_calls.h2
-rw-r--r--source4/libcli/smb2/transport.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index c7613841b8..11bec42737 100644
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -235,7 +235,7 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx,
const char *share,
struct resolve_context *resolve_ctx,
struct cli_credentials *credentials,
- struct event_context *ev,
+ struct tevent_context *ev,
struct smbcli_options *options,
const char *socket_options,
struct gensec_settings *gensec_settings)
@@ -297,7 +297,7 @@ NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx,
struct resolve_context *resolve_ctx,
struct cli_credentials *credentials,
struct smb2_tree **tree,
- struct event_context *ev,
+ struct tevent_context *ev,
struct smbcli_options *options,
const char *socket_options,
struct gensec_settings *gensec_settings)
diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h
index ec246b209d..b89770fbe6 100644
--- a/source4/libcli/smb2/smb2_calls.h
+++ b/source4/libcli/smb2/smb2_calls.h
@@ -105,7 +105,7 @@ struct smb2_setinfo {
};
struct cli_credentials;
-struct event_context;
+struct tevent_context;
struct resolve_context;
struct gensec_settings;
#include "libcli/smb2/smb2_proto.h"
diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index 6d7531f4b5..94ea2586ef 100644
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -33,8 +33,8 @@
/*
an event has happened on the socket
*/
-static void smb2_transport_event_handler(struct event_context *ev,
- struct fd_event *fde,
+static void smb2_transport_event_handler(struct tevent_context *ev,
+ struct tevent_fd *fde,
uint16_t flags, void *private)
{
struct smb2_transport *transport = talloc_get_type(private,
@@ -301,7 +301,7 @@ error:
/*
handle timeouts of individual smb requests
*/
-static void smb2_timeout_handler(struct event_context *ev, struct timed_event *te,
+static void smb2_timeout_handler(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private)
{
struct smb2_request *req = talloc_get_type(private, struct smb2_request);
@@ -380,8 +380,8 @@ void smb2_transport_send(struct smb2_request *req)
talloc_set_destructor(req, smb2_request_destructor);
}
-static void idle_handler(struct event_context *ev,
- struct timed_event *te, struct timeval t, void *private)
+static void idle_handler(struct tevent_context *ev,
+ struct tevent_timer *te, struct timeval t, void *private)
{
struct smb2_transport *transport = talloc_get_type(private,
struct smb2_transport);