Merge branch 'oops-i-split-it-again' into tis-but-thy-name

1 files changed, 5 insertions, 6 deletions

diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c
index 400c2023a9..a73c32da1a 100644
--- a/src/core/transport/transport.c
+++ b/src/core/transport/transport.c
@@ -73,9 +73,8 @@ void grpc_transport_destroy_stream(grpc_transport *transport,
   transport->vtable->destroy_stream(transport, stream);
 }
 
-void grpc_transport_ping(grpc_transport *transport, void (*cb)(void *user_data),
-                         void *user_data) {
-  transport->vtable->ping(transport, cb, user_data);
+void grpc_transport_ping(grpc_transport *transport, grpc_iomgr_closure *cb) {
+  transport->vtable->ping(transport, cb);
 }
 
 void grpc_transport_setup_cancel(grpc_transport_setup *setup) {
@@ -99,13 +98,13 @@ void grpc_transport_setup_del_interested_party(grpc_transport_setup *setup,
 void grpc_transport_stream_op_finish_with_failure(
     grpc_transport_stream_op *op) {
   if (op->send_ops) {
-    op->on_done_send(op->send_user_data, 0);
+    op->on_done_send->cb(op->on_done_send->cb_arg, 0);
   }
   if (op->recv_ops) {
-    op->on_done_recv(op->recv_user_data, 0);
+    op->on_done_recv->cb(op->on_done_recv->cb_arg, 0);
   }
   if (op->on_consumed) {
-    op->on_consumed(op->on_consumed_user_data, 0);
+    op->on_consumed->cb(op->on_consumed->cb_arg, 0);
   }
 }