Changeset: 12ed62cef6d2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/12ed62cef6d2
Modified Files:
gdk/gdk_bbp.c
monetdb5/modules/atoms/json.c
Branch: Dec2023
Log Message:
Some small but important fixes to json upgrade code.
diffs (24 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -4565,7 +4565,7 @@ BBPdiskscan(const char *parent, size_t b
continue; /* ignore .dot files and directories (.
..) */
#ifdef GDKLIBRARY_JSON
- if (strcmp(dent->d_name, "jsonupgradeneed") == 0) {
+ if (strcmp(dent->d_name, "jsonupgradeneeded") == 0) {
continue; /* ignore json upgrade signal file */
}
#endif
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
@@ -599,7 +599,7 @@ jsonRead(str a, size_t *dstlen, stream *
str out = NULL;
str msg;
- if (BATatoms[TYPE_str].atomRead(a, dstlen, s, cnt) == NULL)
+ if ((a = BATatoms[TYPE_str].atomRead(a, dstlen, s, cnt)) == NULL)
return NULL;
if ((msg = JSONstr2json(&out, (const char **) &a)) != MAL_SUCCEED) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
