diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-17 09:58:50 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-08-11 23:57:12 +0200 |
| commit | dcd3e2f2dc43875aec0448d74b2e040290338426 (patch) | |
| tree | dcccc4e1c7c92a101a7dbe0b0e60b2c92ec355f7 /source3 | |
| parent | 7cb94e686075b9815ca645af4f82d094f91c8573 (diff) | |
| download | samba-dcd3e2f2dc43875aec0448d74b2e040290338426.tar.gz samba-dcd3e2f2dc43875aec0448d74b2e040290338426.tar.xz samba-dcd3e2f2dc43875aec0448d74b2e040290338426.zip | |
messaging_dgm: Remove unused "messaging_context"
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/messages.h | 3 | ||||
| -rw-r--r-- | source3/lib/messages.c | 4 | ||||
| -rw-r--r-- | source3/lib/messages_dgm.c | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/source3/include/messages.h b/source3/include/messages.h index 2882483509..669d7f1381 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -73,8 +73,7 @@ struct messaging_backend { void *private_data; }; -int messaging_dgm_init(struct messaging_context *msg_ctx, - TALLOC_CTX *mem_ctx, +int messaging_dgm_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct server_id pid, struct messaging_backend **presult, diff --git a/source3/lib/messages.c b/source3/lib/messages.c index ef87ebb6cb..5cb3fdeaa8 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -244,7 +244,7 @@ struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx, ctx->event_ctx = ev; ctx->have_context = &have_context; - ret = messaging_dgm_init(ctx, ctx, ctx->event_ctx, ctx->id, + ret = messaging_dgm_init(ctx, ctx->event_ctx, ctx->id, &ctx->local, messaging_recv_cb, ctx); if (ret != 0) { @@ -303,7 +303,7 @@ NTSTATUS messaging_reinit(struct messaging_context *msg_ctx) msg_ctx->id = procid_self(); - ret = messaging_dgm_init(msg_ctx, msg_ctx, msg_ctx->event_ctx, + ret = messaging_dgm_init(msg_ctx, msg_ctx->event_ctx, msg_ctx->id, &msg_ctx->local, messaging_recv_cb, msg_ctx); if (ret != 0) { diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c index d35c78b4e3..3fafebdbde 100644 --- a/source3/lib/messages_dgm.c +++ b/source3/lib/messages_dgm.c @@ -29,7 +29,6 @@ #include "librpc/gen_ndr/messaging.h" struct messaging_dgm_context { - struct messaging_context *msg_ctx; struct server_id pid; struct poll_funcs *msg_callbacks; void *tevent_handle; @@ -172,8 +171,7 @@ static int messaging_dgm_lockfile_remove(TALLOC_CTX *tmp_ctx, return ret; } -int messaging_dgm_init(struct messaging_context *msg_ctx, - TALLOC_CTX *mem_ctx, +int messaging_dgm_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct server_id pid, struct messaging_backend **presult, @@ -211,7 +209,6 @@ int messaging_dgm_init(struct messaging_context *msg_ctx, result->private_data = ctx; result->send_fn = messaging_dgm_send; - ctx->msg_ctx = msg_ctx; ctx->pid = pid; ctx->recv_cb = recv_cb; |