aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ruby
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2017-01-25 10:44:30 -0800
committerGravatar Mark D. Roth <roth@google.com>2017-01-25 10:44:30 -0800
commit448c1f002c91806dd51cc605c3607187434ea838 (patch)
tree327c4ac9b1dd0c49b341597073f2af22ba91d0b2 /src/ruby
parent6e0697cd3afe1eb0232456c47734cf2b0acf7abb (diff)
Move parameters for all grpc_op types into their own sub-structs.
Diffstat (limited to 'src/ruby')
-rw-r--r--src/ruby/ext/grpc/rb_call.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ruby/ext/grpc/rb_call.c b/src/ruby/ext/grpc/rb_call.c
index 67a42af619..fbc68c4e59 100644
--- a/src/ruby/ext/grpc/rb_call.c
+++ b/src/ruby/ext/grpc/rb_call.c
@@ -641,7 +641,7 @@ static void grpc_run_batch_stack_cleanup(run_batch_stack *st) {
for (i = 0; i < st->op_num; i++) {
if (st->ops[i].op == GRPC_OP_SEND_MESSAGE) {
- grpc_byte_buffer_destroy(st->ops[i].data.send_message);
+ grpc_byte_buffer_destroy(st->ops[i].data.send_message.send_message);
}
}
}
@@ -673,8 +673,9 @@ static void grpc_run_batch_stack_fill_ops(run_batch_stack *st, VALUE ops_hash) {
st->send_metadata.metadata;
break;
case GRPC_OP_SEND_MESSAGE:
- st->ops[st->op_num].data.send_message = grpc_rb_s_to_byte_buffer(
- RSTRING_PTR(this_value), RSTRING_LEN(this_value));
+ st->ops[st->op_num].data.send_message.send_message =
+ grpc_rb_s_to_byte_buffer(RSTRING_PTR(this_value),
+ RSTRING_LEN(this_value));
st->ops[st->op_num].flags = st->write_flag;
break;
case GRPC_OP_SEND_CLOSE_FROM_CLIENT:
@@ -686,10 +687,11 @@ static void grpc_run_batch_stack_fill_ops(run_batch_stack *st, VALUE ops_hash) {
&st->ops[st->op_num], &st->send_trailing_metadata, this_value);
break;
case GRPC_OP_RECV_INITIAL_METADATA:
- st->ops[st->op_num].data.recv_initial_metadata = &st->recv_metadata;
+ st->ops[st->op_num].data.recv_initial_metadata.recv_initial_metadata =
+ &st->recv_metadata;
break;
case GRPC_OP_RECV_MESSAGE:
- st->ops[st->op_num].data.recv_message = &st->recv_message;
+ st->ops[st->op_num].data.recv_message.recv_message = &st->recv_message;
break;
case GRPC_OP_RECV_STATUS_ON_CLIENT:
st->ops[st->op_num].data.recv_status_on_client.trailing_metadata =