C Core API cleanup.

Simplify grpc_event into something that can be non-heap allocated.
Deprecate grpc_event_finish.
Remove grpc_op_error - use an int as this is more idiomatic C style.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc
index 70c9cb4c3b..f38a694734 100644
--- a/src/cpp/client/client_context.cc
+++ b/src/cpp/client/client_context.cc
@@ -49,15 +49,11 @@ ClientContext::~ClientContext() {
     grpc_call_destroy(call_);
   }
   if (cq_) {
-    grpc_completion_queue_shutdown(cq_);
     // Drain cq_.
-    grpc_event* ev;
-    grpc_completion_type t;
-    do {
-      ev = grpc_completion_queue_next(cq_, gpr_inf_future);
-      t = ev->type;
-      grpc_event_finish(ev);
-    } while (t != GRPC_QUEUE_SHUTDOWN);
+    grpc_completion_queue_shutdown(cq_);
+    while (grpc_completion_queue_next(cq_, gpr_inf_future).type !=
+           GRPC_QUEUE_SHUTDOWN)
+      ;
     grpc_completion_queue_destroy(cq_);
   }
 }