diff options
author | 2015-06-15 11:36:02 -0700 | |
---|---|---|
committer | 2015-06-15 11:36:02 -0700 | |
commit | 18b4b8379259ffa73f8b5414a09bcb682d96b200 (patch) | |
tree | beabff9da156628f36f00504de6c24c9ef3a5393 /include | |
parent | 5e84be56dbec81fbd9f654943378aa15dba49c1e (diff) | |
parent | a3697b451bdfbfa653d42f4b250b5950dd4b61bb (diff) |
Merge pull request #19 from soltanmm/ct-you-complete-me
Fix upstream merge conflicts
Diffstat (limited to 'include')
-rw-r--r-- | include/grpc/grpc.h | 4 | ||||
-rw-r--r-- | include/grpc/support/slice.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index 8c7f272609..d9b7ca216b 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -221,7 +221,7 @@ typedef enum { GRPC_OP_SEND_INITIAL_METADATA = 0, /* Send a message: 0 or more of these operations can occur for each call */ GRPC_OP_SEND_MESSAGE, - /* Send a close from the server: one and only one instance MUST be sent from + /* Send a close from the client: one and only one instance MUST be sent from the client, unless the call was cancelled - in which case this can be skipped */ GRPC_OP_SEND_CLOSE_FROM_CLIENT, @@ -240,7 +240,7 @@ typedef enum { the status will indicate some failure. */ GRPC_OP_RECV_STATUS_ON_CLIENT, - /* Receive status on the server: one and only one must be made on the server + /* Receive close on the server: one and only one must be made on the server */ GRPC_OP_RECV_CLOSE_ON_SERVER } grpc_op_type; diff --git a/include/grpc/support/slice.h b/include/grpc/support/slice.h index 9026602f15..3ee103bfb9 100644 --- a/include/grpc/support/slice.h +++ b/include/grpc/support/slice.h @@ -110,8 +110,9 @@ gpr_slice gpr_slice_ref(gpr_slice s); /* Decrement the ref count of s. If the ref count of s reaches zero, all slices sharing the ref count are destroyed, and considered no longer initialized. If s is ultimately derived from a call to gpr_slice_new(start, - len, dest) where dest!=NULL , then (*dest)(start, len) is called. Requires - s initialized. */ + len, dest) where dest!=NULL , then (*dest)(start) is called, else if s is + ultimately derived from a call to gpr_slice_new_with_len(start, len, dest) + where dest!=NULL , then (*dest)(start, len). Requires s initialized. */ void gpr_slice_unref(gpr_slice s); /* Create a slice pointing at some data. Calls malloc to allocate a refcount |