Changeset: 4b0eea0b0f2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4b0eea0b0f2c
Modified Files:
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_session.c
sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:
Use right calls to free exceptions
diffs (54 lines):
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -969,7 +969,7 @@ parseAtom(Client cntxt)
tpe = parseTypeId(cntxt, TYPE_int);
if( ATOMindex(modnme) < 0) {
if(cntxt->curprg->def->errors)
- GDKfree(cntxt->curprg->def->errors);
+ freeException(cntxt->curprg->def->errors);
cntxt->curprg->def->errors = malAtomDefinition(modnme, tpe);
}
if( strcmp(modnme,"user"))
@@ -1301,7 +1301,7 @@ parseCommandPattern(Client cntxt, int ki
if( msg && ! cntxt->curprg->def->errors)
cntxt->curprg->def->errors = msg;
if(cntxt->curprg->def->errors)
- GDKfree(cntxt->curprg->def->errors);
+ freeException(cntxt->curprg->def->errors);
cntxt->curprg->def->errors = cntxt->backup->def->errors;
cntxt->backup->def->errors = 0;
cntxt->curprg = cntxt->backup;
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -782,7 +782,7 @@ MALengine(Client c)
}
if (prg->def->errors)
- GDKfree(prg->def->errors);
+ freeException(prg->def->errors);
prg->def->errors = NULL;
if (c->itrace)
mnstr_printf(c->fdout, "mdb>#EOD\n");
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
@@ -263,7 +263,7 @@ static int
}
if (msg) {
if (c->curprg->def->errors)
- GDKfree(msg);
+ freeException(msg);
else
c->curprg->def->errors = msg;
}
@@ -1358,7 +1358,7 @@ backend_create_sql_func(backend *be, sql
}
if (msg) {
if (c->curprg->def->errors)
- GDKfree(msg);
+ freeException(msg);
else
c->curprg->def->errors = msg;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
