Changeset: afbd72b72505 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=afbd72b72505
Modified Files:
monetdb5/modules/atoms/streams.c
monetdb5/modules/kernel/algebra.c.mx
monetdb5/modules/kernel/colcalc.c.mx
monetdb5/modules/kernel/column.c.mx
monetdb5/modules/mal/cbp.c
Branch: headless
Log Message:
Printf formatting fixes.
diffs (134 lines):
diff --git a/monetdb5/modules/atoms/streams.c b/monetdb5/modules/atoms/streams.c
--- a/monetdb5/modules/atoms/streams.c
+++ b/monetdb5/modules/atoms/streams.c
@@ -53,7 +53,7 @@
if (s)
mnstr_destroy(s);
throw(IO, "streams.open", "could not open file '%s': %s",
- filename, strerror(errnr));
+ *filename, strerror(errnr));
} else {
*(stream**)S = s;
}
@@ -69,7 +69,7 @@
if (s)
mnstr_destroy(s);
throw(IO, "streams.open", "could not open file '%s': %s",
- filename, strerror(errnr));
+ *filename, strerror(errnr));
} else {
*(stream**)S = s;
}
@@ -85,7 +85,7 @@
if (s)
mnstr_destroy(s);
throw(IO, "streams.open", "could not open file '%s': %s",
- filename, strerror(errnr));
+ *filename, strerror(errnr));
} else {
*(stream**)S = s;
}
diff --git a/monetdb5/modules/kernel/algebra.c.mx
b/monetdb5/modules/kernel/algebra.c.mx
--- a/monetdb5/modules/kernel/algebra.c.mx
+++ b/monetdb5/modules/kernel/algebra.c.mx
@@ -1446,7 +1446,7 @@
str msg;
if( (msg = getCOLdescriptor(&b,bid)) )
- throw(MAL, "algebra.avg", msg);
+ throw(MAL, "algebra.avg", "%s", msg);
cnt = COLcount(b);
if (cnt) {
diff --git a/monetdb5/modules/kernel/colcalc.c.mx
b/monetdb5/modules/kernel/colcalc.c.mx
--- a/monetdb5/modules/kernel/colcalc.c.mx
+++ b/monetdb5/modules/kernel/colcalc.c.mx
@@ -265,7 +265,7 @@
throwagain(MAL,"colcalc.@1",msg);
if ( (bn = COLnew(TYPE_@5, COLcount(br)) ) == NULL) {
CBPreleaseref(br);
- throw(MAL,"colcalc.@1",msg);
+ throw(MAL, "colcalc.@1", "%s", msg);
}
#if CMD_@2 == CMD_DIV
diff --git a/monetdb5/modules/kernel/column.c.mx
b/monetdb5/modules/kernel/column.c.mx
--- a/monetdb5/modules/kernel/column.c.mx
+++ b/monetdb5/modules/kernel/column.c.mx
@@ -120,7 +120,7 @@
str msg;
if ((msg = getCOLdescriptor(&b, bid)) )
- throw(MAL, "column.append", msg);
+ throw(MAL, "column.append", "%s", msg);
if( COLtype(b) >= TYPE_str && ATOMstorage(COLtype(b)) >= TYPE_str)
{
@@ -148,7 +148,7 @@
if ((msg = getCOLdescriptor(&u,uid)) ) {
CBPreleaseref(b);
- throw(MAL, "column.append", msg);
+ throw(MAL, "column.append", "%s", msg);
}
bn = COLappend(b, u, *force);
CBPreleaseref(u);
@@ -169,7 +169,7 @@
str msg;
if ((msg = getCOLdescriptor(&b,bid)) )
- throw(MAL, "column.replace", msg);
+ throw(MAL, "column.replace", "%s", msg);
if ((msg = getCOLdescriptor(&r,rid)) ) {
CBPreleaseref(b);
@@ -248,7 +248,7 @@
str msg;
if ((msg = getCOLdescriptor(&b,bid)) )
- throw(MAL, "column.replace", msg);
+ throw(MAL, "column.replace", "%s", msg);
if ((msg = getCOLdescriptor(&r,rid)) ) {
CBPreleaseref(b);
@@ -685,7 +685,7 @@
str msg;
if ((msg = getCOLdescriptor(&b,bid)) )
- throw(MAL, "column.getMemorySize", msg);
+ throw(MAL, "column.getMemorySize", "%s", msg);
*tot = COLgetMemorySize(b);
CBPreleaseref(b);
@@ -726,15 +726,15 @@
*r = 0;
for ( ; (c = *t) != 0; t++)
if (c != '_' && !GDKisalnum(c))
- throw(MAL,"column.setName","identifier expected: %s",
s);
+ throw(MAL,"column.setName","identifier expected: %s",
*s);
ret = COLname(b, *s);
if (ret == 1)
- throw(MAL,"column.setName","CMDrename: identifier expected:
%s\n", s);
+ throw(MAL,"column.setName","CMDrename: identifier expected:
%s\n", *s);
else if (ret == CBPRENAME_ILLEGAL)
- throw(MAL,"column.setName","CMDrename: illegal temporary name:
'%s'\n", s);
+ throw(MAL,"column.setName","CMDrename: illegal temporary name:
'%s'\n", *s);
else if (ret == CBPRENAME_LONG)
- throw(MAL,"column.setName","CMDrename: name too long: '%s'\n",
s);
+ throw(MAL,"column.setName","CMDrename: name too long: '%s'\n",
*s);
else if (ret != CBPRENAME_ALREADY)
*r = TRUE;
CBPreleaseref(b);
diff --git a/monetdb5/modules/mal/cbp.c b/monetdb5/modules/mal/cbp.c
--- a/monetdb5/modules/mal/cbp.c
+++ b/monetdb5/modules/mal/cbp.c
@@ -124,7 +124,7 @@
str msg;
if ( (msg = getCOLdescriptor(&b, bid)) )
- throw(MAL,"cbp.compress",msg);
+ throw(MAL, "cbp.compress", "%s", msg);
if ( COLcount(b) ){
IODEBUG mnstr_printf(GDKstdout,"#compress COL %d %s %s \n",
*bid, CBP_physical(*bid), *fnme);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
