PR comments

3 files changed, 16 insertions, 17 deletions

diff --git a/src/core/lib/channel/channel_stack.c b/src/core/lib/channel/channel_stack.c
index 0d0260d19e..e02c164aaf 100644
--- a/src/core/lib/channel/channel_stack.c
+++ b/src/core/lib/channel/channel_stack.c
@@ -191,22 +191,22 @@ void grpc_call_stack_init(grpc_exec_ctx *exec_ctx,
 
 void grpc_call_stack_set_pollset_or_pollset_set(
     grpc_exec_ctx *exec_ctx, grpc_call_stack *call_stack, grpc_pollset *pollset,
-    grpc_pollset_set *or_pollset_set) {
+    grpc_pollset_set *pollset_set_alternative) {
   size_t count = call_stack->count;
   grpc_call_element *call_elems;
   char *user_data;
   size_t i;
 
-  GPR_ASSERT(!(pollset != NULL && or_pollset_set != NULL));
-  GPR_ASSERT(pollset != NULL || or_pollset_set != NULL);
+  GPR_ASSERT((pollset == NULL) + (pollset_set_alternative == NULL) == 1);
+  GPR_ASSERT(pollset != NULL || pollset_set_alternative != NULL);
   call_elems = CALL_ELEMS_FROM_STACK(call_stack);
   user_data = ((char *)call_elems) +
               ROUND_UP_TO_ALIGNMENT_SIZE(count * sizeof(grpc_call_element));
 
   /* init per-filter data */
   for (i = 0; i < count; i++) {
-    call_elems[i].filter->set_pollset_or_pollset_set(exec_ctx, &call_elems[i],
-                                                     pollset, or_pollset_set);
+    call_elems[i].filter->set_pollset_or_pollset_set(
+        exec_ctx, &call_elems[i], pollset, pollset_set_alternative);
     user_data +=
         ROUND_UP_TO_ALIGNMENT_SIZE(call_elems[i].filter->sizeof_call_data);
   }
@@ -214,7 +214,7 @@ void grpc_call_stack_set_pollset_or_pollset_set(
 
 void grpc_call_stack_ignore_set_pollset_or_pollset_set(
     grpc_exec_ctx *exec_ctx, grpc_call_element *elem, grpc_pollset *pollset,
-    grpc_pollset_set *or_pollset_set) {}
+    grpc_pollset_set *pollset_set_alternative) {}
 
 void grpc_call_stack_destroy(grpc_exec_ctx *exec_ctx, grpc_call_stack *stack) {
   grpc_call_element *elems = CALL_ELEMS_FROM_STACK(stack);
diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h
index f349939117..027bb23c1d 100644
--- a/src/core/lib/channel/channel_stack.h
+++ b/src/core/lib/channel/channel_stack.h
@@ -104,7 +104,7 @@ typedef struct {
   void (*set_pollset_or_pollset_set)(grpc_exec_ctx *exec_ctx,
                                      grpc_call_element *elem,
                                      grpc_pollset *pollset,
-                                     grpc_pollset_set *or_pollset_set);
+                                     grpc_pollset_set *pollset_set_alternative);
   /* Destroy per call data.
      The filter does not need to do any chaining */
   void (*destroy_call_elem)(grpc_exec_ctx *exec_ctx, grpc_call_element *elem);
@@ -203,7 +203,7 @@ void grpc_call_stack_init(grpc_exec_ctx *exec_ctx,
  * op is started */
 void grpc_call_stack_set_pollset_or_pollset_set(
     grpc_exec_ctx *exec_ctx, grpc_call_stack *call_stack, grpc_pollset *pollset,
-    grpc_pollset_set *or_pollset_set);
+    grpc_pollset_set *pollset_set_alternative);
 
 #ifdef GRPC_STREAM_REFCOUNT_DEBUG
 #define GRPC_CALL_STACK_REF(call_stack, reason) \
@@ -233,7 +233,7 @@ void grpc_call_stack_destroy(grpc_exec_ctx *exec_ctx, grpc_call_stack *stack);
  * Does nothing. */
 void grpc_call_stack_ignore_set_pollset_or_pollset_set(
     grpc_exec_ctx *exec_ctx, grpc_call_element *elem, grpc_pollset *pollset,
-    grpc_pollset_set *or_pollset_set);
+    grpc_pollset_set *pollset_set_alternative);
 /* Call the next operation in a call stack */
 void grpc_call_next_op(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
                        grpc_transport_stream_op *op);
diff --git a/src/core/lib/channel/connected_channel.c b/src/core/lib/channel/connected_channel.c
index f445f59d0b..405f0a2ecd 100644
--- a/src/core/lib/channel/connected_channel.c
+++ b/src/core/lib/channel/connected_channel.c
@@ -93,22 +93,21 @@ static void init_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
   GPR_ASSERT(r == 0);
 }
 
-static void set_pollset_or_pollset_set(grpc_exec_ctx *exec_ctx,
-                                       grpc_call_element *elem,
-                                       grpc_pollset *pollset,
-                                       grpc_pollset_set *or_pollset_set) {
-  GPR_ASSERT(!(pollset != NULL && or_pollset_set != NULL));
-  GPR_ASSERT(pollset != NULL || or_pollset_set != NULL);
+static void set_pollset_or_pollset_set(
+    grpc_exec_ctx *exec_ctx, grpc_call_element *elem, grpc_pollset *pollset,
+    grpc_pollset_set *pollset_set_alternative) {
+  GPR_ASSERT((pollset == NULL) + (pollset_set_alternative == NULL) == 1);
+  GPR_ASSERT(pollset != NULL || pollset_set_alternative != NULL);
 
   call_data *calld = elem->call_data;
   channel_data *chand = elem->channel_data;
   if (pollset != NULL) {
     grpc_transport_set_pollset(exec_ctx, chand->transport,
                                TRANSPORT_STREAM_FROM_CALL_DATA(calld), pollset);
-  } else if (or_pollset_set != NULL) {
+  } else if (pollset_set_alternative != NULL) {
     grpc_transport_set_pollset_set(exec_ctx, chand->transport,
                                    TRANSPORT_STREAM_FROM_CALL_DATA(calld),
-                                   or_pollset_set);
+                                   pollset_set_alternative);
   }
 }