diff options
| author | David CARLIER <devnexen@gmail.com> | 2021-03-10 16:02:55 +0000 |
|---|---|---|
| committer | Anel <an3l@users.noreply.github.com> | 2021-03-11 09:36:23 +0100 |
| commit | a6cd4612a9e802a365f8fc37e0da6a24e2541133 (patch) | |
| tree | bc0e0ee5d543932cec5f512d3f0de5f88bcefdca | |
| parent | f11b60879beba19798a76e17af206a95fd8fd204 (diff) | |
| download | mariadb-git-a6cd4612a9e802a365f8fc37e0da6a24e2541133.tar.gz | |
connect storage, little compile issues fix proposal.
| -rw-r--r-- | storage/connect/bsonudf.cpp | 12 | ||||
| -rw-r--r-- | storage/connect/jsonudf.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp index 29fe0a6bf22..5b4332d6e9e 100644 --- a/storage/connect/bsonudf.cpp +++ b/storage/connect/bsonudf.cpp @@ -653,7 +653,7 @@ PVAL BJNX::GetCalcValue(PGLOBAL g, PBVAL bap, int n) { // For calculated arrays, a local Value must be used int lng = 0; - short type, prec = 0; + short type = 0, prec = 0; bool b = n < Nod - 1; PVAL valp; PBVAL vlp, vp; @@ -4714,7 +4714,7 @@ char *bfile_convert(UDF_INIT* initid, UDF_ARGS* args, char* result, str = (char*)g->Xchk; if (!str) { - PUSH_WARNING(g->Message ? g->Message : "Unexpected error"); + PUSH_WARNING(g->Message[0] != '\0' ? g->Message : "Unexpected error"); *is_null = 1; *error = 1; *res_length = 0; @@ -4774,7 +4774,7 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result, if (!g->Xchk) { int msgid = MSGID_OPEN_MODE_STRERROR; - FILE *fout; + FILE *fout = NULL; FILE *fin; if (!(fin = global_fopen(g, msgid, fn, "rt"))) @@ -4837,7 +4837,7 @@ char *bfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result, str = (char*)g->Xchk; if (!str) { - if (g->Message) + if (g->Message[0] != '\0') str = strcpy(result, g->Message); else str = strcpy(result, "Unexpected error"); @@ -5003,7 +5003,7 @@ char *bbin_array_add(UDF_INIT *initid, UDF_ARGS *args, char *result, uint n = 2; int* x = GetIntArgPtr(g, args, n); BJNX bnx(g, NULL, TYPE_STRING); - PBVAL jarp, top, jvp = NULL; + PBVAL top, jarp = NULL, jvp = NULL; PBVAL jsp = bnx.MakeValue(args, 0, true, &top); if (bnx.CheckPath(g, args, jsp, jvp, 2)) @@ -5636,7 +5636,7 @@ char *bbin_object_values(UDF_INIT *initid, UDF_ARGS *args, char *result, if (!bsp) { if (!CheckMemory(g, initid, args, 1, true, true)) { BJNX bnx(g); - PBVAL top, jarp; + PBVAL top, jarp = NULL; PBVAL jvp = bnx.MakeValue(args, 0, true, &top); if (jvp->Type == TYPE_JOB) { diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp index 96e1db8f6c3..79e1534c51c 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -5865,7 +5865,7 @@ char *jfile_convert(UDF_INIT* initid, UDF_ARGS* args, char* result, str = (char*)g->Xchk; if (!str) { - PUSH_WARNING(g->Message ? g->Message : "Unexpected error"); + PUSH_WARNING(g->Message[0] != '\0' ? g->Message : "Unexpected error"); *is_null = 1; *error = 1; *res_length = 0; @@ -5926,7 +5926,7 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result, if (!g->Xchk) { int msgid = MSGID_OPEN_MODE_STRERROR; - FILE *fout; + FILE *fout = NULL; FILE *fin; if (!(fin = global_fopen(g, msgid, fn, "rt"))) @@ -5993,7 +5993,7 @@ char *jfile_bjson(UDF_INIT *initid, UDF_ARGS *args, char *result, str = (char*)g->Xchk; if (!str) { - if (g->Message) + if (g->Message[0] != '\0') str = strcpy(result, g->Message); else str = strcpy(result, "Unexpected error"); |