diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-10-08 13:32:32 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-10-08 13:32:32 -0700 |
| commit | 7a0ae4c7f7bbeb8baef19c6d7c3e5c5b0dbe96a2 (patch) | |
| tree | 3639f056b650d298fb1bbb660bad8cb7e1d69609 /src/core/surface | |
| parent | 7fd0fd5023a74aa02a43f4a956b59e4965e651ce (diff) | |
| parent | 6d22a583610c02de4f5c5139570ea5fcfb010a25 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into cq_alarm
Diffstat (limited to 'src/core/surface')
| -rw-r--r-- | src/core/surface/byte_buffer.c | 1 | ||||
| -rw-r--r-- | src/core/surface/call.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/core/surface/byte_buffer.c b/src/core/surface/byte_buffer.c index a930949f2d..295ef5ab0e 100644 --- a/src/core/surface/byte_buffer.c +++ b/src/core/surface/byte_buffer.c @@ -97,4 +97,5 @@ size_t grpc_byte_buffer_length(grpc_byte_buffer *bb) { } gpr_log(GPR_ERROR, "should never reach here"); abort(); + return 0; } diff --git a/src/core/surface/call.c b/src/core/surface/call.c index d687cca2e0..a606955003 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -436,6 +436,7 @@ static grpc_cq_completion *allocate_completion(grpc_call *call) { } gpr_log(GPR_ERROR, "should never reach here"); abort(); + return NULL; } static void done_completion(grpc_exec_ctx *exec_ctx, void *call, |