From: Volker Lendecke <vl@samba.org>
Date: Thu, 17 Jul 2014 09:58:50 +0000 (+0000)
Subject: messaging_dgm: Remove unused "messaging_context"
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=dcd3e2f2dc43875aec0448d74b2e040290338426;p=obnox%2Fsamba%2Fsamba-obnox.git

messaging_dgm: Remove unused "messaging_context"

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/include/messages.h b/source3/include/messages.h
index 28824835098..669d7f13813 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 ef87ebb6cb5..5cb3fdeaa88 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 d35c78b4e32..3fafebdbdec 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;