diff options
Diffstat (limited to 'storage/connect/bsonudf.cpp')
| -rw-r--r-- | storage/connect/bsonudf.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp index dcf072242c8..a56db4d731b 100644 --- a/storage/connect/bsonudf.cpp +++ b/storage/connect/bsonudf.cpp @@ -31,6 +31,9 @@ int JsonDefPrec = -1; int GetDefaultPrec(void); int IsArgJson(UDF_ARGS* args, uint i); void SetChanged(PBSON bsp); +int GetJsonDefPrec(void); + +static PBSON BbinAlloc(PGLOBAL g, ulong len, PBVAL jsp); /* --------------------------------- JSON UDF ---------------------------------- */ @@ -59,7 +62,7 @@ inline void JsonFreeMem(PGLOBAL g) { /*********************************************************************************/ /* Allocate and initialize a BSON structure. */ /*********************************************************************************/ -PBSON BbinAlloc(PGLOBAL g, ulong len, PBVAL jsp) +static PBSON BbinAlloc(PGLOBAL g, ulong len, PBVAL jsp) { PBSON bsp = (PBSON)PlgDBSubAlloc(g, NULL, sizeof(BSON)); @@ -391,7 +394,7 @@ PSZ BJNX::MakeKey(UDF_ARGS *args, int i) } // endif *s if (n < 1) - return NewStr("Key"); + return NewStr((PSZ)"Key"); if (!b) { p = (PSZ)BsonSubAlloc(n + 1); @@ -405,7 +408,7 @@ PSZ BJNX::MakeKey(UDF_ARGS *args, int i) return NewStr((PSZ)s); } // endif count - return NewStr("Key"); + return NewStr((PSZ)"Key"); } // end of MakeKey /*********************************************************************************/ @@ -1635,7 +1638,7 @@ PBVAL BJNX::ParseJsonFile(PGLOBAL g, char *fn, int& pty, size_t& len) len = (size_t)mm.lenL; if (mm.lenH) - len += ((size_t)mm.lenH * 0x000000001LL); + len += mm.lenH; memory = (char *)mm.memory; |