Changeset: 0207d8168cc8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0207d8168cc8
Modified Files:
configure.ag
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/optimizer/opt_multiplex.c
Branch: headless
Log Message:
Merge with default branch.
diffs (77 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -562,6 +562,7 @@
X_CFLAGS="$X_CFLAGS -Wformat=2 -Wno-format-nonliteral"
X_CFLAGS="$X_CFLAGS -Winit-self"
X_CFLAGS="$X_CFLAGS -Winvalid-pch"
+ X_CFLAGS="$X_CFLAGS -Wmissing-format-attribute"
X_CFLAGS="$X_CFLAGS -Wpacked"
X_CFLAGS="$X_CFLAGS -Wunknown-pragmas"
case "$CC-$gcc_ver" in
@@ -629,7 +630,6 @@
dnl X_CFLAGS="$X_CFLAGS -Wfloat-equal"
dnl X_CFLAGS="$X_CFLAGS -Winline"
dnl X_CFLAGS="$X_CFLAGS -Wmissing-declarations"
- dnl X_CFLAGS="$X_CFLAGS -Wmissing-format-attribute"
dnl X_CFLAGS="$X_CFLAGS -Wmissing-noreturn"
dnl X_CFLAGS="$X_CFLAGS -Wmissing-prototypes"
dnl X_CFLAGS="$X_CFLAGS -Wnested-externs"
diff --git a/monetdb5/modules/kernel/microbenchmark.c
b/monetdb5/modules/kernel/microbenchmark.c
--- a/monetdb5/modules/kernel/microbenchmark.c
+++ b/monetdb5/modules/kernel/microbenchmark.c
@@ -307,8 +307,8 @@
str
MBMrandom(int *ret, oid *base, int *size, int *domain){
- BAT *bn;
-
+ BAT *bn = NULL;
+
BATrandom(&bn, base, size, domain);
if( bn ){
COLsetreadonly(bn
@@ -319,8 +319,8 @@
str
MBMuniform(int *ret, oid *base, int *size, int *domain){
- BAT *bn;
-
+ BAT *bn = NULL;
+
BATuniform(&bn, base, size, domain);
if( bn ){
COLsetreadonly(bn
@@ -331,7 +331,7 @@
str
MBMnormal(int *ret, oid *base, int *size, int *domain, int *stddev, int *mean){
- BAT *bn;
+ BAT *bn = NULL;
BATnormal(&bn, base, size, domain, stddev, mean);
if( bn ){
COLsetreadonly(bn
@@ -373,8 +373,8 @@
str
MBMskewed(int *ret, oid *base, int *size, int *domain, int *skew){
- BAT *bn;
-
+ BAT *bn = NULL;
+
BATskewed(&bn, base, size, domain, skew);
if( bn ){
COLsetreadonly(bn
diff --git a/monetdb5/optimizer/opt_multiplex.c
b/monetdb5/optimizer/opt_multiplex.c
--- a/monetdb5/optimizer/opt_multiplex.c
+++ b/monetdb5/optimizer/opt_multiplex.c
@@ -273,9 +273,6 @@
if (mb->errors){
/* rollback */
}
- if ( mb->errors == 0)
- setLifespan(mb); /* leave a proper initialized life span behind
*/
-
return mb->errors? 0: actions;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
