Changeset: c81b292ca257 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c81b292ca257
Modified Files:
gdk/gdk_bbp.c
sql/server/rel_planner.c
Branch: Jul2017
Log Message:
Use LLFMT also for scanf.
diffs (77 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -946,7 +946,7 @@ headheapinit(oid *hseq, const char *buf,
int n;
if (sscanf(buf,
- " %10s %hu %hu %hu %lld %lld %lld %lld %lld %lld %lld %lld
%hu"
+ " %10s %hu %hu %hu "LLFMT" "LLFMT" "LLFMT" "LLFMT" "LLFMT"
"LLFMT" "LLFMT" "LLFMT" %hu"
"%n",
type, &width, &var, &properties, &nokey0,
&nokey1, &nosorted, &norevsorted, &base,
@@ -990,14 +990,14 @@ heapinit(BAT *b, const char *buf, int *h
norevsorted = 0; /* default for first case */
if (bbpversion <= GDKLIBRARY_TALIGN ?
sscanf(buf,
- " %10s %hu %hu %hu %lld %lld %lld %lld %lld %lld %lld %lld
%hu"
+ " %10s %hu %hu %hu "LLFMT" "LLFMT" "LLFMT" "LLFMT" "LLFMT"
"LLFMT" "LLFMT" "LLFMT" %hu"
"%n",
type, &width, &var, &properties, &nokey0,
&nokey1, &nosorted, &norevsorted, &base,
&align, &free, &size, &storage,
&n) < 13 :
sscanf(buf,
- " %10s %hu %hu %hu %lld %lld %lld %lld %lld %lld %lld %hu"
+ " %10s %hu %hu %hu "LLFMT" "LLFMT" "LLFMT" "LLFMT" "LLFMT"
"LLFMT" "LLFMT" %hu"
"%n",
type, &width, &var, &properties, &nokey0,
&nokey1, &nosorted, &norevsorted, &base,
@@ -1075,7 +1075,7 @@ vheapinit(BAT *b, const char *buf, int h
if (b->tvheap == NULL)
GDKfatal("BBPinit: cannot allocate memory for heap.");
if (sscanf(buf,
- " %lld %lld %hu"
+ " "LLFMT" "LLFMT" %hu"
"%n",
&free, &size, &storage, &n) < 3)
GDKfatal("BBPinit: invalid format for BBP.dir\n%s",
buf);
@@ -1133,7 +1133,7 @@ BBPreadEntries(FILE *fp, int bbpversion)
if (bbpversion <= GDKLIBRARY_INSERTED ?
sscanf(buf,
- "%lld %hu %128s %128s %128s %d %u %lld %lld %lld
%lld %lld %hu %hu %hu %hu"
+ LLFMT" %hu %128s %128s %128s %d %u "LLFMT" "LLFMT"
"LLFMT" "LLFMT" "LLFMT" %hu %hu %hu %hu"
"%n",
&batid, &status, headname, tailname, filename,
&lastused, &properties, &inserted, &deleted, &first,
@@ -1142,7 +1142,7 @@ BBPreadEntries(FILE *fp, int bbpversion)
&nread) < 16 :
bbpversion <= GDKLIBRARY_HEADED ?
sscanf(buf,
- "%lld %hu %128s %128s %128s %d %u %lld %lld %lld %hu
%hu %hu %hu"
+ LLFMT" %hu %128s %128s %128s %d %u "LLFMT" "LLFMT"
"LLFMT" %hu %hu %hu %hu"
"%n",
&batid, &status, headname, tailname, filename,
&lastused, &properties, &first,
@@ -1150,7 +1150,7 @@ BBPreadEntries(FILE *fp, int bbpversion)
&map_theap,
&nread) < 14 :
sscanf(buf,
- "%lld %hu %128s %128s %u %lld %lld %lld"
+ LLFMT" %hu %128s %128s %u "LLFMT" "LLFMT" "LLFMT
"%n",
&batid, &status, headname, filename,
&properties,
diff --git a/sql/server/rel_planner.c b/sql/server/rel_planner.c
--- a/sql/server/rel_planner.c
+++ b/sql/server/rel_planner.c
@@ -863,7 +863,7 @@ memojoins_print( list *joins )
static void
memoitem_print( memoitem *mi )
{
- printf("# %s(count=%lld,width=%lld,cost=%f): ", mi->name, mi->count,
mi->width, mi->cost);
+ printf("# %s(count="LLFMT",width="LLFMT",cost=%f): ", mi->name,
mi->count, mi->width, mi->cost);
memojoins_print(mi->joins);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
