Changeset: 71e72c0a1475 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71e72c0a1475
Modified Files:
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
sql/backends/monet5/sql_gencode.c
Branch: Dec2016
Log Message:
Clean up around newvariable + fixing some leaks.
diffs (76 lines):
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -752,7 +752,7 @@ makeVarSpace(MalBlkPtr mb)
/* create and initialize a variable record*/
int
-newVariable(MalBlkPtr mb, str name, size_t len, malType type)
+newVariable(MalBlkPtr mb, const char *name, size_t len, malType type)
{
int n;
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -147,7 +147,7 @@ mal_export int findVariableLength(MalBlk
mal_export malType getType(MalBlkPtr mb, str nme);
mal_export str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx);
mal_export void setVarName(MalBlkPtr mb, int i, str nme);
-mal_export int newVariable(MalBlkPtr mb, str name, size_t len, malType type);
+mal_export int newVariable(MalBlkPtr mb, const char *name, size_t len, malType
type);
mal_export int cloneVariable(MalBlkPtr dst, MalBlkPtr src, int varid);
mal_export void renameVariable(MalBlkPtr mb, int i, str pattern, int newid);
mal_export int copyVariable(MalBlkPtr dst, VarPtr v);
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -475,7 +475,7 @@ static int
char buf[64];
snprintf(buf,64,"A%s",nme);
- varid = newVariable(curBlk, (char *)buf, strlen(buf),
type);
+ varid = newVariable(curBlk, buf, strlen(buf), type);
curInstr = pushArgument(curBlk, curInstr, varid);
setVarType(curBlk, varid, type);
setVarUDFtype(curBlk, varid);
@@ -577,7 +577,7 @@ static int
char buf[64];
snprintf(buf,64,"A%s",nme);
- varid = newVariable(curBlk, (char*) buf,strlen(buf),
type);
+ varid = newVariable(curBlk, buf,strlen(buf), type);
curInstr = pushArgument(curBlk, curInstr, varid);
setVarType(curBlk, varid, type);
setVarUDFtype(curBlk, varid);
@@ -3180,9 +3180,9 @@ backend_create_sql_func(backend *be, sql
stmt *s = n->data;
int type = tail_type(s)->type->localtype;
int varid = 0;
- char *buf = GDKmalloc(MAXIDENTLEN);
-
- (void) snprintf(buf, MAXIDENTLEN, "A%d", argc);
+ char buf[IDLENGTH];
+
+ (void) snprintf(buf, IDLENGTH, "A%d", argc);
varid = newVariable(curBlk, buf, strlen(buf), type);
curInstr = pushArgument(curBlk, curInstr, varid);
setVarType(curBlk, varid, type);
@@ -3196,14 +3196,14 @@ backend_create_sql_func(backend *be, sql
sql_arg *a = n->data;
int type = a->type.type->localtype;
int varid = 0;
- char *buf = GDKmalloc(MAXIDENTLEN);
+ char buf[IDLENGTH];
if (buf == NULL)
goto cleanup;
if (a->name)
- (void) snprintf(buf, MAXIDENTLEN, "A%s",
a->name);
+ (void) snprintf(buf, IDLENGTH, "A%s", a->name);
else
- (void) snprintf(buf, MAXIDENTLEN, "A%d", argc);
+ (void) snprintf(buf, IDLENGTH, "A%d", argc);
varid = newVariable(curBlk, buf, strlen(buf), type);
curInstr = pushArgument(curBlk, curInstr, varid);
setVarType(curBlk, varid, type);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
