MonetDB: Dec2011 - Fixed indent, removed unused code.

[Sjoerd Mullender]

Changeset: b7fc08d320ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7fc08d320ae
Modified Files:
        monetdb5/modules/kernel/kprelude.mx
Branch: Dec2011
Log Message:

Fixed indent, removed unused code.
resBAT, resultBAT and voidresultBAT are never called with an extra
argument, so we don't need it.


diffs (95 lines):

diff --git a/monetdb5/modules/kernel/kprelude.mx 
b/monetdb5/modules/kernel/kprelude.mx
--- a/monetdb5/modules/kernel/kprelude.mx
+++ b/monetdb5/modules/kernel/kprelude.mx
@@ -21,48 +21,48 @@ All Rights Reserved.
 The Mx macros below are used in many places throughout the code base.
 
 @= getBATdescriptor
-       if( (@2= BATdescriptor(*@1)) == NULL ){ @4;
-                throw(MAL, @3, RUNTIME_OBJECT_MISSING);
-   }
+       if ((@2 = BATdescriptor(*@1)) == NULL) {
+               @4;
+               throw(MAL, @3, RUNTIME_OBJECT_MISSING);
+       }
 @= tstBAT
-if( bn== NULL) {*ret= 0;
-    throw(MAL, @1, MAL_MALLOC_FAIL);}
+       if (bn == NULL) {
+               *ret = 0;
+               throw(MAL, @1, MAL_MALLOC_FAIL);
+       }
 
 @= resBAT
-    bn = BATnew(ATOMtype(b->htype), TYPE_@1, BATcount(b));
-    if ( bn== NULL) {
-               @3
+       bn = BATnew(ATOMtype(b->htype), TYPE_@1, BATcount(b));
+       if (bn == NULL) {
                throw(MAL, @2, MAL_MALLOC_FAIL);
-    }
-    bn->hsorted = b->hsorted;
-    bn->tsorted = b->tsorted;
-    bn->H->nonil = b->H->nonil;
-    bn->T->nonil = b->T->nonil;
-    BATkey(bn, BAThkey(b));
+       }
+       bn->hsorted = b->hsorted;
+       bn->tsorted = b->tsorted;
+       bn->H->nonil = b->H->nonil;
+       bn->T->nonil = b->T->nonil;
+       BATkey(bn, BAThkey(b));
 
 @= resultBAT
-    if (BAThvoid(b)) {
-        bn = BATnew(TYPE_void, TYPE_@1, BATcount(b));
-        BATseqbase(bn, b->hseqbase);
-    } else {
-        bn = BATnew(b->htype, TYPE_@1, BATcount(b));
-    }
-    if ( bn== NULL) {
-               @3
+       if (BAThvoid(b)) {
+               bn = BATnew(TYPE_void, TYPE_@1, BATcount(b));
+               BATseqbase(bn, b->hseqbase);
+       } else {
+               bn = BATnew(b->htype, TYPE_@1, BATcount(b));
+       }
+       if (bn == NULL) {
                throw(MAL, @2, MAL_MALLOC_FAIL);
-    }
-    bn->hsorted = b->hsorted;
-    bn->tsorted = b->tsorted;
-    if (!BAThvoid(b))
-       bn->H->nonil = b->H->nonil;
-    bn->T->nonil = b->T->nonil;
-    BATkey(bn, BAThkey(b));
+       }
+       bn->hsorted = b->hsorted;
+       bn->tsorted = b->tsorted;
+       if (!BAThvoid(b))
+               bn->H->nonil = b->H->nonil;
+       bn->T->nonil = b->T->nonil;
+       BATkey(bn, BAThkey(b));
 
 @= voidresultBAT
        bn = BATnew(TYPE_void, @1, BATcount(b));
        BATseqbase(bn, b->hseqbase);
        if (bn == NULL) {
-               @3
                throw(MAL, @2, MAL_MALLOC_FAIL);
        }
        bn->hsorted = b->hsorted;
@@ -73,10 +73,8 @@ if( bn== NULL) {*ret= 0;
 @= Pseudo
        if (BBPindex("view_@1_@2") <= 0)
                BATname(b, "@2");
-       BATroles(b,"@1","@2");
-       BATmode(b,TRANSIENT);
+       BATroles(b, "@1", "@2");
+       BATmode(b, TRANSIENT);
        BBPkeepref(b->batCacheid);
        BATfakeCommit(b);
        *ret = b->batCacheid;
-
-
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list