From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 2D06E430412 for ; Mon, 17 Aug 2020 16:41:06 +0300 (MSK) Received: by mail-lf1-f66.google.com with SMTP id k13so8400607lfo.0 for ; Mon, 17 Aug 2020 06:41:06 -0700 (PDT) From: Cyrill Gorcunov Date: Mon, 17 Aug 2020 16:39:18 +0300 Message-Id: <20200817133918.875558-10-gorcunov@gmail.com> In-Reply-To: <20200817133918.875558-1-gorcunov@gmail.com> References: <20200817133918.875558-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v8 9/9] xrow: drop xrow_header_dup_body List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Cc: Vladislav Shpilevoy We no longer use it. Closes #5129 Signed-off-by: Cyrill Gorcunov --- src/box/xrow.c | 15 --------------- src/box/xrow.h | 8 -------- 2 files changed, 23 deletions(-) diff --git a/src/box/xrow.c b/src/box/xrow.c index 03a4abdda..9aa2fae00 100644 --- a/src/box/xrow.c +++ b/src/box/xrow.c @@ -220,21 +220,6 @@ xrow_header_decode(struct xrow_header *header, const char **pos, return 0; } -int -xrow_header_dup_body(struct xrow_header *row, struct region *region) -{ - assert(row->bodycnt == 1); - size_t size = row->body[0].iov_len; - char *copy = (char *)region_alloc(region, size); - if (copy == NULL) { - diag_set(OutOfMemory, size, "region_alloc", "copy"); - return -1; - } - memcpy(copy, row->body[0].iov_base, size); - row->body[0].iov_base = copy; - return 1; -} - /** * @pre pos points at a valid msgpack */ diff --git a/src/box/xrow.h b/src/box/xrow.h index 20e82034d..58d47b12d 100644 --- a/src/box/xrow.h +++ b/src/box/xrow.h @@ -141,14 +141,6 @@ int xrow_header_decode(struct xrow_header *header, const char **pos, const char *end, bool end_is_exact); -/** - * Duplicate the xrow's body onto the given region. - * @retval -1 Error. - * @retval >= 0 Iov count in the body. - */ -int -xrow_header_dup_body(struct xrow_header *header, struct region *region); - /** * DML request. */ -- 2.26.2