Changeset: 9b58c8aba265 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b58c8aba265
Modified Files:
monetdb5/modules/atoms/json.c
Branch: atom_strings
Log Message:
Fix JSONfromString (again) after merging with default
diffs (19 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
@@ -125,14 +125,7 @@ JSONfromString(const char *src, size_t *
return -1;
*len = slen + 1;
}
- if (external) {
- if (GDKstrFromStr((unsigned char *) *j,
- (const unsigned char *) src,
(ssize_t) slen) < 0)
- return -1;
- src = *j;
- } else {
- strcpy(*j, src);
- }
+ strcpy(*j, src);
jt = JSONparse(*j);
if (jt == NULL)
return -1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
