Changeset: 6dd4eab92bf2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6dd4eab92bf2
Modified Files:
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/opt_datacell.c
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/receptor.c
Branch: Aug2011
Log Message:
Fix formatters in datacell code
diffs (74 lines):
diff --git a/sql/backends/monet5/datacell/basket.c
b/sql/backends/monet5/datacell/basket.c
--- a/sql/backends/monet5/datacell/basket.c
+++ b/sql/backends/monet5/datacell/basket.c
@@ -293,7 +293,8 @@
for ( bskt = 0; bskt < bsktLimit; bskt++)
if ( baskets[bskt].name){
- mnstr_printf(GDKout, "#baskets[%2d] %s columns %d threshold %d
window=[%d,%d] time window=[%d,%d] beat %d milliseconds events " BUNFMT "\n",
bskt,
+ mnstr_printf(GDKout, "#baskets[%2d] %s columns %d threshold %d
window=[%d,%d] time window=[%lld,%lld] beat %lld milliseconds events " BUNFMT
"\n",
+ bskt,
baskets[bskt].name,
baskets[bskt].colcount,
baskets[bskt].threshold,
diff --git a/sql/backends/monet5/datacell/emitter.c
b/sql/backends/monet5/datacell/emitter.c
--- a/sql/backends/monet5/datacell/emitter.c
+++ b/sql/backends/monet5/datacell/emitter.c
@@ -451,7 +451,7 @@
/* keep the events and try to setup a new
connection */
break;
if (em->table.error) {
- mnstr_printf(GDKerr, em->table.error);
+ mnstr_printf(GDKerr, "%s", em->table.error);
em->table.error = 0;
}
} else
diff --git a/sql/backends/monet5/datacell/opt_datacell.c
b/sql/backends/monet5/datacell/opt_datacell.c
--- a/sql/backends/monet5/datacell/opt_datacell.c
+++ b/sql/backends/monet5/datacell/opt_datacell.c
@@ -300,7 +300,7 @@
printFunction(cntxt->fdout, mb, 0, LIST_MAL_STMT | LIST_MAPI);
}
DEBUGoptimizers
- mnstr_printf(cntxt->fdout, "#opt_reduce: %d ms\n", t);
+ mnstr_printf(cntxt->fdout, "#opt_reduce: %lld ms\n", t);
QOTupdateStatistics("datacell", actions, t);
addtoMalBlkHistory(mb, "datacell");
return msg;
diff --git a/sql/backends/monet5/datacell/petrinet.c
b/sql/backends/monet5/datacell/petrinet.c
--- a/sql/backends/monet5/datacell/petrinet.c
+++ b/sql/backends/monet5/datacell/petrinet.c
@@ -260,18 +260,18 @@
int i, k;
mnstr_printf(PNout,"#scheduler status %s\n", statusnames[status]);
for (i = 0; i < pnettop; i++) {
- mnstr_printf(PNout, "#[%d]\t%s %s delay %d cycles %d events %d
time %d ms\n",
+ mnstr_printf(PNout, "#[%d]\t%s %s delay %d cycles %d events %d
time %lld ms\n",
i, pnet[i].name, statusnames[pnet[i].status],
pnet[i].delay, pnet[i].cycles, pnet[i].events, pnet[i].time/1000);
if ( pnet[i].error)
mnstr_printf(PNout,"#%s\n", pnet[i].error);
for (k = 0; k < pnet[i].srctop; k++)
- mnstr_printf(PNout, "#<--\t%s basket[%d] %d\n",
+ mnstr_printf(PNout, "#<--\t%s basket[%d] " SZFMT " "
SZFMT "\n",
pnet[i].source[k].table,
pnet[i].source[k].bskt,
pnet[i].source[k].lastcount,
pnet[i].source[k].consumed);
for (k = 0; k < pnet[i].trgttop; k++)
- mnstr_printf(PNout, "#-->\t%s basket[%d] %d %d\n",
+ mnstr_printf(PNout, "#-->\t%s basket[%d] " SZFMT " "
SZFMT "\n",
pnet[i].target[k].table,
pnet[i].source[k].bskt,
pnet[i].target[k].lastcount,
diff --git a/sql/backends/monet5/datacell/receptor.c
b/sql/backends/monet5/datacell/receptor.c
--- a/sql/backends/monet5/datacell/receptor.c
+++ b/sql/backends/monet5/datacell/receptor.c
@@ -553,7 +553,7 @@
}
BSKTunlock(&rc->lck, &rc->name);
if (rc->table.error) {
- mnstr_printf(GDKerr, rc->table.error);
+ mnstr_printf(GDKerr, "%s", rc->table.error);
rc->table.error = 0;
}
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
