From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <v.shpilevoy@tarantool.org>
Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
 bits)) (No client certificate requested)
 by dev.tarantool.org (Postfix) with ESMTPS id A717D46971A
 for <tarantool-patches@dev.tarantool.org>;
 Fri,  6 Dec 2019 02:58:59 +0300 (MSK)
References: <cover.1574846892.git.korablev@tarantool.org>
 <2a81f02865168030c1632b4b4000ea331c84a016.1574846892.git.korablev@tarantool.org>
 <d172a68f-83af-46bd-f14d-a6cb76e63d7f@tarantool.org>
 <20191205113933.GB15510@tarantool.org>
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Message-ID: <42b6da43-0842-8d4f-d646-12f8bcda98d5@tarantool.org>
Date: Fri, 6 Dec 2019 00:58:57 +0100
MIME-Version: 1.0
In-Reply-To: <20191205113933.GB15510@tarantool.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Subject: Re: [Tarantool-patches] [PATCH 1/6] sql: refactor resulting set
 metadata
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Nikita Pettik <korablev@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

Hi! Thanks for the fixes!

Please, apply:

diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c
index e5528c0e2..f2cf386bb 100644
--- a/src/box/sql/vdbeaux.c
+++ b/src/box/sql/vdbeaux.c
@@ -1865,7 +1865,7 @@ vdbe_metadata_set_col_name(struct Vdbe *p, int idx, const char *name)
 {
 	assert(idx < p->nResColumn);
 	if (p->metadata[idx].name != NULL)
-		free((void *)p->metadata[idx].name);
+		free(p->metadata[idx].name);
 	p->metadata[idx].name = strdup(name);
 	if (p->metadata[idx].name == NULL) {
 		diag_set(OutOfMemory, strlen(name) + 1, "strdup", "name");
@@ -1879,7 +1879,7 @@ vdbe_metadata_set_col_type(struct Vdbe *p, int idx, const char *type)
 {
 	assert(idx < p->nResColumn);
 	if (p->metadata[idx].type != NULL)
-		free((void *)p->metadata[idx].type);
+		free(p->metadata[idx].type);
 	p->metadata[idx].type = strdup(type);
 	if (p->metadata[idx].type == NULL) {
 		diag_set(OutOfMemory, strlen(type) + 1, "strdup", "type");