MonetDB: wlcr - sync with default

[Martin Kersten]

Changeset: da48718da1b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da48718da1b7
Modified Files:
        monetdb5/mal/mal_builder.c
Branch: wlcr
Log Message:

sync with default


diffs (24 lines):

diff --git a/monetdb5/mal/mal_builder.c b/monetdb5/mal/mal_builder.c
--- a/monetdb5/mal/mal_builder.c
+++ b/monetdb5/mal/mal_builder.c
@@ -458,16 +458,11 @@ pushStr(MalBlkPtr mb, InstrPtr q, const 
        if (q == NULL)
                return NULL;
        cst.vtype= TYPE_str;
-       if( Val == 0){
-               cst.val.sval = 0;
-               cst.len= 0;
-       } else{
-               if ( Val != NULL && (cst.val.sval= GDKstrdup(Val)) == NULL) {
-                       freeInstruction(q);
-                       return NULL;
-               }
-               cst.len= (int) strlen(cst.val.sval);
+       if ((cst.val.sval= GDKstrdup(Val)) == NULL) {
+               freeInstruction(q);
+               return NULL;
        }
+       cst.len= (int) strlen(cst.val.sval);
        _t = defConstant(mb,TYPE_str,&cst);
        return pushArgument(mb, q, _t);
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list