[Tarantool-patches] [PATCH 1/6] sql: refactor resulting set metadata

Vladislav Shpilevoy v.shpilevoy at tarantool.org
Fri Dec 6 02:58:57 MSK 2019


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");


More information about the Tarantool-patches mailing list