Changeset: 200b8cf6ae4b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=200b8cf6ae4b
Modified Files:
sql/backends/monet5/sql_gencode.mx
Branch: Mar2011
Log Message:
Merge with Oct2010 branch.
diffs (30 lines):
diff --git a/sql/backends/monet5/sql_gencode.mx
b/sql/backends/monet5/sql_gencode.mx
--- a/sql/backends/monet5/sql_gencode.mx
+++ b/sql/backends/monet5/sql_gencode.mx
@@ -155,12 +155,9 @@
char *cn = column_name(sql->sa, c);
char *ntn = sql_escape_ident(tn);
char *nsn = sql_escape_ident(sn);
- char *fqtn = alloca(sizeof(char) * (strlen(nsn) + 1 +
strlen(ntn) + 1));
+ char fqtn[512];
- fqtn[0]=0;
- strcat(fqtn, nsn);
- strcat(fqtn, ".");
- strcat(fqtn, ntn);
+ snprintf(fqtn,512,"%s.%s", nsn,ntn);
q = newStmt1(mb, sqlRef, "rsColumn");
q = pushArgument(mb, q, s->nr);
@@ -2233,9 +2230,9 @@
sql_subtype *pt = cq->params+i;
if (!atom_cast(a, pt)) {
- char buf[BUFSIZ];
+ char buf[512];
- snprintf(buf, BUFSIZ, "wrong type for argument
%d of "
+ snprintf(buf, 512, "wrong type for argument %d
of "
"function call: %s, expected %s\n",
i + 1, atom_type(a)->type->sqlname,
pt->type->sqlname);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
