MonetDB: default - always parse input using ATOMfromstr, since w...

[Fabian Groffen]

Changeset: 9a62e6c564de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a62e6c564de
Modified Files:
        MonetDB5/src/modules/mal/remote.mx
Branch: default
Log Message:

always parse input using ATOMfromstr, since we used ATOMtostr on the other side


diffs (44 lines):

diff -r 126ae945293e -r 9a62e6c564de MonetDB5/src/modules/mal/remote.mx
--- a/MonetDB5/src/modules/mal/remote.mx        Fri Sep 10 15:05:39 2010 +0200
+++ b/MonetDB5/src/modules/mal/remote.mx        Fri Sep 10 15:26:43 2010 +0200
@@ -1089,29 +1089,20 @@
                        assert(0); /* FIXME */
                }
 
-               if (ATOMvarsized(h)) {
-                       l = (ptr)(val == NULL ? str_nil : val);
-               } else {
-                       s = 0;
-                       l = NULL;
-                       if (val == NULL)
-                               val = "nil";
-                       ATOMfromstr(h, &l, &s, val);
-               }
-               if (ATOMvarsized(t)) {
-                       r = (ptr)(var == NULL ? str_nil : var);
-               } else {
-                       s = 0;
-                       r = NULL;
-                       if (var == NULL)
-                               var = "nil";
-                       ATOMfromstr(t, &r, &s, var);
-               }
+               s = 0;
+               l = NULL;
+               ATOMfromstr(h, &l, &s, val);
+
+               s = 0;
+               r = NULL;
+               ATOMfromstr(t, &r, &s, var);
 
                BUNins(b, l, r, FALSE);
 
-               if (!ATOMvarsized(h)) GDKfree(l);
-               if (!ATOMvarsized(t)) GDKfree(r);
+               if (!ATOMvarsized(h))
+                       GDKfree(l);
+               if (!ATOMvarsized(t))
+                       GDKfree(r);
        }
 
        v->val.bval = b->batCacheid;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list