Kim Kempf | 531d52d | 2017-10-02 17:10:54 -0700 | [diff] [blame] | 1 | diff -Naur grpc-c_orig/lib/client.c grpc-c/lib/client.c |
| 2 | --- grpc-c_orig/lib/client.c 2017-06-26 01:14:17.000000000 -0700 |
| 3 | +++ grpc-c/lib/client.c 2017-10-01 15:04:38.028008999 -0700 |
| 4 | @@ -239,7 +239,7 @@ |
| 5 | if (grpc_c_ops_alloc(context, 1)) return 1; |
| 6 | |
| 7 | context->gcc_ops[op_count].op = GRPC_OP_RECV_MESSAGE; |
| 8 | - context->gcc_ops[op_count].data.recv_message = &context->gcc_payload; |
| 9 | + context->gcc_ops[op_count].data.recv_message.recv_message = &context->gcc_payload; |
| 10 | context->gcc_op_count++; |
| 11 | |
| 12 | grpc_call_error e = grpc_call_start_batch(context->gcc_call, |
| 13 | @@ -752,7 +752,7 @@ |
| 14 | input_packer(input, &context->gcc_ops_payload[op_count]); |
| 15 | |
| 16 | context->gcc_ops[op_count].op = GRPC_OP_SEND_MESSAGE; |
| 17 | - context->gcc_ops[op_count].data.send_message |
| 18 | + context->gcc_ops[op_count].data.send_message.send_message |
| 19 | = context->gcc_ops_payload[op_count]; |
| 20 | op_count++; |
| 21 | |
| 22 | @@ -760,12 +760,12 @@ |
| 23 | op_count++; |
| 24 | |
| 25 | context->gcc_ops[op_count].op = GRPC_OP_RECV_INITIAL_METADATA; |
| 26 | - context->gcc_ops[op_count].data.recv_initial_metadata |
| 27 | + context->gcc_ops[op_count].data.recv_initial_metadata.recv_initial_metadata |
| 28 | = context->gcc_initial_metadata; |
| 29 | op_count++; |
| 30 | |
| 31 | context->gcc_ops[op_count].op = GRPC_OP_RECV_MESSAGE; |
| 32 | - context->gcc_ops[op_count].data.recv_message = &context->gcc_payload; |
| 33 | + context->gcc_ops[op_count].data.recv_message.recv_message = &context->gcc_payload; |
| 34 | op_count++; |
| 35 | |
| 36 | /* |
| 37 | diff -Naur grpc-c_orig/lib/service.c grpc-c/lib/service.c |
| 38 | --- grpc-c_orig/lib/service.c 2017-06-26 01:14:17.000000000 -0700 |
| 39 | +++ grpc-c/lib/service.c 2017-10-01 14:54:11.676008999 -0700 |
| 40 | @@ -169,7 +169,7 @@ |
| 41 | */ |
| 42 | if (context->gcc_read_event->gce_refcount == 0) { |
| 43 | context->gcc_ops[op_count].op = GRPC_OP_RECV_MESSAGE; |
| 44 | - context->gcc_ops[op_count].data.recv_message |
| 45 | + context->gcc_ops[op_count].data.recv_message.recv_message |
| 46 | = &context->gcc_payload; |
| 47 | |
| 48 | context->gcc_read_event->gce_type = GRPC_C_EVENT_READ; |
| 49 | @@ -343,7 +343,7 @@ |
| 50 | .gcmf_output_packer(output, &context->gcc_ops_payload[op_count]); |
| 51 | |
| 52 | context->gcc_ops[context->gcc_op_count].op = GRPC_OP_SEND_MESSAGE; |
| 53 | - context->gcc_ops[context->gcc_op_count].data.send_message |
| 54 | + context->gcc_ops[context->gcc_op_count].data.send_message.send_message |
| 55 | = context->gcc_ops_payload[op_count]; |
| 56 | |
| 57 | context->gcc_op_count++; |