Changeset: a559af546856 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a559af546856
Modified Files:
monetdb5/modules/atoms/json.c
Branch: default
Log Message:
Merged with oscar
diffs (31 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
@@ -1247,13 +1247,6 @@ JSONplaintext(char **r, size_t *l, size_
}
static str
-JSONjson2text(str *ret, json *js)
-{
- char *sep = " ";
- return JSONjson2textSeparator(ret, js, &sep);
-}
-
-static str
JSONjson2textSeparator(str *ret, json *js, str *sep)
{
JSON *jt;
@@ -1281,6 +1274,13 @@ JSONjson2textSeparator(str *ret, json *j
}
static str
+JSONjson2text(str *ret, json *js)
+{
+ char *sep = " ";
+ return JSONjson2textSeparator(ret, js, &sep);
+}
+
+static str
JSONjson2numberInternal(void **ret, json *js, void (*str2num)(void **ret,
const char *nptr, size_t len)) {
JSON *jt;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
