Fix core banned functions

pull/9411/head
Craig Tiller 8 years ago
parent 0cf6a71b72
commit 7fa7d6817e
  1. 3
      include/grpc/slice_buffer.h
  2. 7
      src/core/lib/slice/slice_buffer.c

@ -78,7 +78,8 @@ GPRAPI void grpc_slice_buffer_trim_end(grpc_slice_buffer *src, size_t n,
GPRAPI void grpc_slice_buffer_move_first(grpc_slice_buffer *src, size_t n, GPRAPI void grpc_slice_buffer_move_first(grpc_slice_buffer *src, size_t n,
grpc_slice_buffer *dst); grpc_slice_buffer *dst);
/* move the first n bytes of src into dst (copying them) */ /* move the first n bytes of src into dst (copying them) */
GPRAPI void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer *src, GPRAPI void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx *exec_ctx,
grpc_slice_buffer *src,
size_t n, void *dst); size_t n, void *dst);
/* take the first slice in the slice buffer */ /* take the first slice in the slice buffer */
GPRAPI grpc_slice grpc_slice_buffer_take_first(grpc_slice_buffer *src); GPRAPI grpc_slice grpc_slice_buffer_take_first(grpc_slice_buffer *src);

@ -282,7 +282,8 @@ void grpc_slice_buffer_move_first(grpc_slice_buffer *src, size_t n,
GPR_ASSERT(src->count > 0); GPR_ASSERT(src->count > 0);
} }
void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer *src, size_t n, void grpc_slice_buffer_move_first_into_buffer(grpc_exec_ctx *exec_ctx,
grpc_slice_buffer *src, size_t n,
void *dst) { void *dst) {
char *dstp = dst; char *dstp = dst;
GPR_ASSERT(src->length >= n); GPR_ASSERT(src->length >= n);
@ -297,13 +298,13 @@ void grpc_slice_buffer_move_first_into_buffer(grpc_slice_buffer *src, size_t n,
n = 0; n = 0;
} else if (slice_len == n) { } else if (slice_len == n) {
memcpy(dstp, GRPC_SLICE_START_PTR(slice), n); memcpy(dstp, GRPC_SLICE_START_PTR(slice), n);
grpc_slice_unref(slice); grpc_slice_unref_internal(exec_ctx, slice);
n = 0; n = 0;
} else { } else {
memcpy(dstp, GRPC_SLICE_START_PTR(slice), slice_len); memcpy(dstp, GRPC_SLICE_START_PTR(slice), slice_len);
dstp += slice_len; dstp += slice_len;
n -= slice_len; n -= slice_len;
grpc_slice_unref(slice); grpc_slice_unref_internal(exec_ctx, slice);
} }
} }
} }

Loading…
Cancel
Save