MonetDB: default - Merge from Dec2011 branch.

[Stefan Manegold]

Changeset: 728534311dda for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=728534311dda
Modified Files:
        
Branch: default
Log Message:

Merge from Dec2011 branch.


diffs (42 lines):

diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c
+++ b/buildtools/Mx/Code.c
@@ -341,6 +341,7 @@ CodeSubBlk(char *sub, char **argv)
       outofmem:
        Error("Limit of %d characters per block reached.", blk_size);
        exit(1);
+       return NULL; /* icc demands this, clang-3.0 chokes on it */
 }
 
 void
diff --git a/buildtools/Mx/Mx.c b/buildtools/Mx/Mx.c
--- a/buildtools/Mx/Mx.c
+++ b/buildtools/Mx/Mx.c
@@ -146,7 +146,7 @@ main(int argc, char **argv)
        if (mode & M_DRAFT)
                GenForm();
 
-       exit(mx_err ? 1 : 0);
+       return(mx_err ? 1 : 0);
 }
 
 Directive str2dir[] = {
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -432,7 +432,6 @@ msab_registerStop(void)
                fprintf(f, LLFMT "\n", (lng)time(NULL));
                (void)fflush(f);
                (void)fclose(f);
-               return(NULL);
        } else {
                char buf[PATHLENGTH];
                snprintf(buf, sizeof(buf), "failed to open file: %s (%s)",
@@ -445,6 +444,7 @@ msab_registerStop(void)
        if ((tmp = getDBPath(&path, PATHLENGTH, _sabaoth_internal_uuid)) != 
NULL)
                return(tmp);
        unlink(path);
+       return(NULL);
 }
 
 /**
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list