MonetDB: json-storage - remove one copy

[Niels Nes via checkin-list]

Changeset: f24331c1202c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f24331c1202c
Modified Files:
        monetdb5/modules/atoms/json.c
Branch: json-storage
Log Message:

remove one copy


diffs (39 lines):

diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -521,7 +521,7 @@ JSONstr2json(json *ret, str *j)
 {
        str msg = MAL_SUCCEED;
        json buf = NULL;
-       json *p = &buf;
+       //json *p = &buf;
        size_t ln = 2*strlen(*j)+1;
        size_t out_size = 0;
 
@@ -531,21 +531,18 @@ JSONstr2json(json *ret, str *j)
        buf = (json)GDKmalloc(ln);
        if (buf == NULL) {
                msg = createException(MAL, "json.new", SQLSTATE(HY013) 
MAL_MALLOC_FAIL);
-               goto bailout1;
+               goto bailout;
        }
 
        msg = JSONtoStorageString(jt, 0, &buf, &out_size);
        if (msg != MAL_SUCCEED) {
-               goto bailout2;
+               GDKfree(buf);
+               goto bailout;
        }
 
-       if ((*ret = GDKstrdup(*p)) == NULL) {
-               msg = createException(MAL, "json.new", SQLSTATE(HY013) 
MAL_MALLOC_FAIL);
-       }
+       *ret = buf;
 
- bailout2:
-       GDKfree(buf);
- bailout1:
+ bailout:
        JSONfree(jt);
        return msg;
 }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org