Author: metze Date: 2006-07-27 12:59:41 +0000 (Thu, 27 Jul 2006) New Revision: 17272
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17272 Log: move the callback stuff into a substructure metze Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.c Changeset: Modified: branches/SAMBA_4_0/source/auth/gensec/gensec.c =================================================================== --- branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-07-27 12:20:19 UTC (rev 17271) +++ branches/SAMBA_4_0/source/auth/gensec/gensec.c 2006-07-27 12:59:41 UTC (rev 17272) @@ -909,8 +909,10 @@ DATA_BLOB in; DATA_BLOB out; NTSTATUS status; - void (*callback)(struct gensec_update_request *req, void *private_data); - void *private_data; + struct { + void (*fn)(struct gensec_update_request *req, void *private_data); + void *private_data; + } callback; }; static void gensec_update_async_timed_handler(struct event_context *ev, struct timed_event *te, @@ -918,7 +920,7 @@ { struct gensec_update_request *req = talloc_get_type(ptr, struct gensec_update_request); req->status = req->gensec_security->ops->update(req->gensec_security, req, req->in, &req->out); - req->callback(req, req->private_data); + req->callback.fn(req, req->callback.private_data); } /** @@ -940,11 +942,11 @@ req = talloc(gensec_security, struct gensec_update_request); if (!req) goto failed; - req->gensec_security = gensec_security; - req->in = in; - req->out = data_blob(NULL, 0); - req->callback = callback; - req->private_data = private_data; + req->gensec_security = gensec_security; + req->in = in; + req->out = data_blob(NULL, 0); + req->callback.fn = callback; + req->callback.private_data = private_data; te = event_add_timed(gensec_security->event_ctx, req, timeval_zero(),
