Commit 6be0ddae authored by Monty's avatar Monty

Fixed compiler warnings in CONNECT

parent 07abcb50
...@@ -1051,7 +1051,7 @@ int JOBJECT::GetSize(bool b) { ...@@ -1051,7 +1051,7 @@ int JOBJECT::GetSize(bool b) {
for (PJPR jpp = First; jpp; jpp = jpp->Next) for (PJPR jpp = First; jpp; jpp = jpp->Next)
// If b return only non null pairs // If b return only non null pairs
if (!b || jpp->Val && !jpp->Val->IsNull()) if (!b || (jpp->Val && !jpp->Val->IsNull()))
n++; n++;
return n; return n;
...@@ -1581,10 +1581,12 @@ PVAL JVALUE::GetValue(PGLOBAL g) ...@@ -1581,10 +1581,12 @@ PVAL JVALUE::GetValue(PGLOBAL g)
PVAL valp = NULL; PVAL valp = NULL;
if (DataType != TYPE_JSON) if (DataType != TYPE_JSON)
{
if (DataType == TYPE_STRG) if (DataType == TYPE_STRG)
valp = AllocateValue(g, Strp, DataType, Nd); valp = AllocateValue(g, Strp, DataType, Nd);
else else
valp = AllocateValue(g, &LLn, DataType, Nd); valp = AllocateValue(g, &LLn, DataType, Nd);
}
return valp; return valp;
} // end of GetValue } // end of GetValue
...@@ -1755,6 +1757,7 @@ void JVALUE::SetValue(PGLOBAL g, PVAL valp) ...@@ -1755,6 +1757,7 @@ void JVALUE::SetValue(PGLOBAL g, PVAL valp)
case TYPE_TINY: case TYPE_TINY:
B = valp->GetTinyValue() != 0; B = valp->GetTinyValue() != 0;
DataType = TYPE_BOOL; DataType = TYPE_BOOL;
break;
case TYPE_INT: case TYPE_INT:
N = valp->GetIntValue(); N = valp->GetIntValue();
DataType = TYPE_INTG; DataType = TYPE_INTG;
......
...@@ -6,9 +6,7 @@ ...@@ -6,9 +6,7 @@
#pragma once #pragma once
#if defined(_WIN32) #if defined(_WIN32)
static PCSZ slash = "\\";
#else // !_WIN32 #else // !_WIN32
static PCSZ slash = "/";
#define stricmp strcasecmp #define stricmp strcasecmp
#endif // !_WIN32 #endif // !_WIN32
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment