summaryrefslogtreecommitdiff
path: root/source4/client
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/client
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/client')
-rw-r--r--source4/client/cifsdd.c6
-rw-r--r--source4/client/cifsdd.h4
-rw-r--r--source4/client/cifsddio.c6
-rw-r--r--source4/client/client.c10
4 files changed, 13 insertions, 13 deletions
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 8d0b87d722..302d470afd 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -355,7 +355,7 @@ static void print_transfer_stats(void)
}
static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
const char * which, const char **ports,
struct smbcli_options *smb_options,
const char *socket_options,
@@ -408,7 +408,7 @@ static struct dd_iohandle * open_file(struct resolve_context *resolve_ctx,
return(handle);
}
-static int copy_files(struct event_context *ev, struct loadparm_context *lp_ctx)
+static int copy_files(struct tevent_context *ev, struct loadparm_context *lp_ctx)
{
uint8_t * iobuf; /* IO buffer. */
uint64_t iomax; /* Size of the IO buffer. */
@@ -549,7 +549,7 @@ int main(int argc, const char ** argv)
{
int i;
const char ** dd_args;
- struct event_context *ev;
+ struct tevent_context *ev;
poptContext pctx;
struct poptOption poptions[] = {
diff --git a/source4/client/cifsdd.h b/source4/client/cifsdd.h
index 28fe6778f4..e39c046fe8 100644
--- a/source4/client/cifsdd.h
+++ b/source4/client/cifsdd.h
@@ -90,10 +90,10 @@ struct dd_iohandle
struct smbcli_options;
struct smbcli_session_options;
-struct event_context;
+struct tevent_context;
struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
const char * path,
const char **ports,
uint64_t io_size, int options,
diff --git a/source4/client/cifsddio.c b/source4/client/cifsddio.c
index 06631ee3ac..ab18dd08d1 100644
--- a/source4/client/cifsddio.c
+++ b/source4/client/cifsddio.c
@@ -221,7 +221,7 @@ static bool smb_write_func(void * handle, uint8_t * buf, uint64_t wanted,
}
static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
const char * host,
const char **ports,
const char * share,
@@ -303,7 +303,7 @@ static int open_smb_file(struct smbcli_state * cli,
}
static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
const char * host,
const char **ports,
const char * share,
@@ -354,7 +354,7 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx
/* ------------------------------------------------------------------------- */
struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
- struct event_context *ev,
+ struct tevent_context *ev,
const char * path,
const char **ports,
uint64_t io_size,
diff --git a/source4/client/client.c b/source4/client/client.c
index a600b5fb0c..13b7053396 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -2557,7 +2557,7 @@ static void display_share_result(struct srvsvc_NetShareCtr1 *ctr1)
try and browse available shares on a host
****************************************************************************/
static bool browse_host(struct loadparm_context *lp_ctx,
- struct event_context *ev_ctx,
+ struct tevent_context *ev_ctx,
const char *query_host)
{
struct dcerpc_pipe *p;
@@ -3041,7 +3041,7 @@ static int process_stdin(struct smbclient_context *ctx)
return a connection to a server
*******************************************************/
static bool do_connect(struct smbclient_context *ctx,
- struct event_context *ev_ctx,
+ struct tevent_context *ev_ctx,
struct resolve_context *resolve_ctx,
const char *specified_server, const char **ports,
const char *specified_share,
@@ -3088,7 +3088,7 @@ static bool do_connect(struct smbclient_context *ctx,
handle a -L query
****************************************************************************/
static int do_host_query(struct loadparm_context *lp_ctx,
- struct event_context *ev_ctx,
+ struct tevent_context *ev_ctx,
const char *query_host,
const char *workgroup)
{
@@ -3104,7 +3104,7 @@ handle a message operation
static int do_message_op(const char *netbios_name, const char *desthost,
const char **destports, const char *destip,
int name_type,
- struct event_context *ev_ctx,
+ struct tevent_context *ev_ctx,
struct resolve_context *resolve_ctx,
struct smbcli_options *options,
struct smb_iconv_convenience *iconv_convenience,
@@ -3160,7 +3160,7 @@ static int do_message_op(const char *netbios_name, const char *desthost,
int rc = 0;
int name_type = 0x20;
TALLOC_CTX *mem_ctx;
- struct event_context *ev_ctx;
+ struct tevent_context *ev_ctx;
struct smbclient_context *ctx;
const char *cmdstr = NULL;
struct smbcli_options smb_options;