Fix clang compile error in tabjson and typo in tabbson.cpp

MariaDB · Jun 25, 2021 · 7863554 · 7863554
1 parent af7a089
commit 7863554
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/storage/connect/tabbson.cpp b/storage/connect/tabbson.cpp
@@ -1492,7 +1492,7 @@ int TDBBSN::EstimatedLength(void)
 } // end of Estimated Length
 
 /***********************************************************************/
-/*  OpenDB: Data Base open routine for JSN access method.              */
+/*  OpenDB: Data Base open routine for BSN access method.              */
 /***********************************************************************/
 bool TDBBSN::OpenDB(PGLOBAL g)
 {

diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp
@@ -1173,7 +1173,7 @@ int TDBJSN::ReadDB(PGLOBAL g) {
 /***********************************************************************/
 /*  Make the top tree from the object path.                            */
 /***********************************************************************/
-int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
+bool TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
 {
   if (Objname) {
     if (!Val) {
@@ -1210,7 +1210,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
             // Old style
             if (objpath[strlen(objpath) - 1] != ']') {
               sprintf(g->Message, "Invalid Table path %s", Objname);
-              return NULL;
+              return true;
             } else if (!bp)
               objpath++;
 
@@ -1239,7 +1239,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
   } else
     Top = jsp;
 
-  return RC_OK;
+  return false;
 } // end of MakeTopTree
 
 /***********************************************************************/

diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h
@@ -170,7 +170,7 @@ class DllExport TDBJSN : public TDBDOS {
 
 protected:
           PJSON FindRow(PGLOBAL g);
-          int   MakeTopTree(PGLOBAL g, PJSON jsp);
+          bool  MakeTopTree(PGLOBAL g, PJSON jsp);
 
   // Members
 	PGLOBAL G;											 // Support of parse memory