summaryrefslogtreecommitdiff
path: root/storage/connect/json.cpp
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2021-03-19 22:55:40 +0200
committerMonty <monty@mariadb.org>2021-03-20 21:17:32 +0200
commitc22e6eeda81b9c3b8c79d4ef527b2a002d6d691b (patch)
treec475a17ecc723e91268fe00991765b1b9454c1b9 /storage/connect/json.cpp
parent93bb755dc8a9e68719c12ba621e048d3603d0123 (diff)
downloadmariadb-git-c22e6eeda81b9c3b8c79d4ef527b2a002d6d691b.tar.gz
Fix compiler warnings in connect engine
- Removed not used variables - Added /* fall through */ to switches - Removed not used static variable 'slash' from header file - Removed test of fp->field_length >= 0 as it is always true
Diffstat (limited to 'storage/connect/json.cpp')
-rw-r--r--storage/connect/json.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/connect/json.cpp b/storage/connect/json.cpp
index bd9c4fac7a1..d9fe3db7aa0 100644
--- a/storage/connect/json.cpp
+++ b/storage/connect/json.cpp
@@ -1001,7 +1001,7 @@ int JOBJECT::GetSize(bool b) {
for (PJPR jpp = First; jpp; jpp = jpp->Next)
// If b return only non null pairs
- if (!b || jpp->Val && !jpp->Val->IsNull())
+ if (!b || (jpp->Val && !jpp->Val->IsNull()))
n++;
return n;
@@ -1530,10 +1530,12 @@ PVAL JVALUE::GetValue(PGLOBAL g)
PVAL valp = NULL;
if (DataType != TYPE_JSON)
+ {
if (DataType == TYPE_STRG)
valp = AllocateValue(g, Strp, DataType, Nd);
else
valp = AllocateValue(g, &LLn, DataType, Nd);
+ }
return valp;
} // end of GetValue
@@ -1704,6 +1706,7 @@ void JVALUE::SetValue(PGLOBAL g, PVAL valp)
case TYPE_TINY:
B = valp->GetTinyValue() != 0;
DataType = TYPE_BOOL;
+ break;
case TYPE_INT:
N = valp->GetIntValue();
DataType = TYPE_INTG;