Changeset: d876d154cb51 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d876d154cb51
Modified Files:
monetdb5/modules/kernel/batstr.c
Branch: txtsim
Log Message:
fix uninitialized errors on optimized compilation
diffs (63 lines):
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -1768,12 +1768,10 @@ prefix_or_suffix_cst(Client cntxt, MalBl
bool nils = false;
struct canditer ci1 = {0};
oid off1;
- bat *res = getArgReference_bat(stk, pci, 0), *bid =
getArgReference_bat(stk, pci, 1), *sid1;
+ bat *res = getArgReference_bat(stk, pci, 0), *bid =
getArgReference_bat(stk, pci, 1), *sid1 = NULL;
/* checking if icase is ~NULL and not if it is true or false */
if (pci->argc == 4 || pci->argc == 5) {
- if (icase)
- sid1 = NULL;
- else {
+ if (!icase) {
assert(getArgType(mb, pci, 3) == TYPE_bat);
sid1 = getArgReference_bat(stk, pci, 3);
}
@@ -1894,12 +1892,10 @@ prefix_or_suffix_strcst(Client cntxt, Ma
bool nils = false;
struct canditer ci1 = {0};
oid off1;
- bat *res = getArgReference_bat(stk, pci, 0), *bid =
getArgReference_bat(stk, pci, 2), *sid1;
+ bat *res = getArgReference_bat(stk, pci, 0), *bid =
getArgReference_bat(stk, pci, 2), *sid1 = NULL;
/* checking if icase is ~NULL and not if it is true or false */
if (pci->argc == 4 || pci->argc == 5) {
- if (icase)
- sid1 = NULL;
- else {
+ if (!icase) {
assert(getArgType(mb, pci, 3) == TYPE_bat);
sid1 = getArgReference_bat(stk, pci, 3);
}
@@ -2143,12 +2139,10 @@ search_string_bat_cst(Client cntxt, MalB
bool nils = false;
struct canditer ci1 = {0};
oid off1;
- bat *res = getArgReference_bat(stk, pci, 0), *bid =
getArgReference_bat(stk, pci, 1), *sid1;
+ bat *res = getArgReference_bat(stk, pci, 0), *bid =
getArgReference_bat(stk, pci, 1), *sid1 = NULL;
/* checking if icase is ~NULL and not if it is true or false */
if (pci->argc == 4 || pci->argc == 5) {
- if (icase)
- sid1 = NULL;
- else {
+ if (!icase) {
assert(getArgType(mb, pci, 3) == TYPE_bat);
sid1 = getArgReference_bat(stk, pci, 3);
}
@@ -2265,12 +2259,10 @@ search_string_bat_strcst(Client cntxt, M
bool nils = false;
struct canditer ci1 = {0};
oid off1;
- bat *res = getArgReference_bat(stk, pci, 0), *bid =
getArgReference_bat(stk, pci, 2), *sid1;
+ bat *res = getArgReference_bat(stk, pci, 0), *bid =
getArgReference_bat(stk, pci, 2), *sid1 = NULL;
/* checking if icase is ~NULL and not if it is true or false */
if (pci->argc == 4 || pci->argc == 5) {
- if (icase)
- sid1 = NULL;
- else {
+ if (!icase) {
assert(getArgType(mb, pci, 3) == TYPE_bat);
sid1 = getArgReference_bat(stk, pci, 3);
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
