From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 34441308B2 for ; Thu, 13 Jun 2019 18:24:36 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9znLXInIGggZ for ; Thu, 13 Jun 2019 18:24:36 -0400 (EDT) Received: from smtp47.i.mail.ru (smtp47.i.mail.ru [94.100.177.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 4FFF430C48 for ; Thu, 13 Jun 2019 18:24:35 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCH v1 16/28] sql: remove SQL_TOOBIG errcode References: <94ba93d8866c7e8acf41f4ca99d3b6ee45a1ca10.1560174553.git.imeevma@gmail.com> From: Vladislav Shpilevoy Message-ID: Date: Fri, 14 Jun 2019 00:24:51 +0200 MIME-Version: 1.0 In-Reply-To: <94ba93d8866c7e8acf41f4ca99d3b6ee45a1ca10.1560174553.git.imeevma@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org, imeevma@tarantool.org Thanks for the patch! Consider my review fixes below and on the branch in a separate commit. ====================================================== diff --git a/src/box/sql/vdbeapi.c b/src/box/sql/vdbeapi.c index ad8684dda..e41621049 100644 --- a/src/box/sql/vdbeapi.c +++ b/src/box/sql/vdbeapi.c @@ -274,14 +274,14 @@ setResultStrOrError(sql_context * pCtx, /* Function context */ void (*xDel) (void *) /* Destructor function */ ) { - if (sqlVdbeMemSetStr(pCtx->pOut, z, n,1, xDel) != 0) + if (sqlVdbeMemSetStr(pCtx->pOut, z, n, 1, xDel) != 0) pCtx->is_aborted = true; } static int invokeValueDestructor(const void *p, /* Value to destroy */ void (*xDel) (void *), /* The destructor */ - sql_context * pCtx /* Set an error if no NULL */ + sql_context *pCtx /* Set an error if no NULL */ ) { assert(xDel != SQL_DYNAMIC); @@ -306,7 +306,7 @@ sql_result_blob(sql_context * pCtx, ) { assert(n >= 0); - if (sqlVdbeMemSetStr(pCtx->pOut, z, n,0, xDel) != 0) + if (sqlVdbeMemSetStr(pCtx->pOut, z, n, 0, xDel) != 0) pCtx->is_aborted = true; }