Changeset: 0f96c70ceef7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0f96c70ceef7
Modified Files:
monetdb5/modules/atoms/str.c
monetdb5/modules/kernel/batstr.c
Branch: txtsim
Log Message:
compilation fixes for window32
diffs (198 lines):
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -3760,7 +3760,7 @@ STRstartsWith(Client cntxt, MalBlkPtr mb
const str *arg1 = getArgReference(stk, pci, 1), *arg2 =
getArgReference(stk, pci, 2);
bit icase = pci->argc == 4 && *getArgReference_bit(stk, pci, 3) ? true
: false;
str s = *arg1, prefix = *arg2, msg = MAL_SUCCEED;
- int plen = strlen(prefix);
+ int plen = str_strlen(prefix);
*res = (strNil(s) || strNil(prefix)) ? bit_nil :
icase ? str_is_iprefix(s, prefix, plen) : str_is_prefix(s,
prefix, plen);
@@ -3770,7 +3770,7 @@ STRstartsWith(Client cntxt, MalBlkPtr mb
bit
str_is_suffix(const char *s, const char *suffix, int sul)
{
- int sl = strlen(s);
+ int sl = str_strlen(s);
if (sl < sul)
return 0;
@@ -3781,7 +3781,7 @@ str_is_suffix(const char *s, const char
bit
str_is_isuffix(const char *s, const char *suffix, int sul)
{
- int sl = strlen(s);
+ int sl = str_strlen(s);
if (sl < sul)
return 0;
@@ -3801,7 +3801,7 @@ STRendsWith(Client cntxt, MalBlkPtr mb,
const str *arg1 = getArgReference(stk, pci, 1), *arg2 =
getArgReference(stk, pci, 2);
bit icase = pci->argc == 4 && *getArgReference_bit(stk, pci, 3) ? true
: false;
str s = *arg1, suffix = *arg2, msg = MAL_SUCCEED;
- int sul = strlen(suffix);
+ int sul = str_strlen(suffix);
*res = (strNil(s) || strNil(suffix)) ? bit_nil :
icase ? str_is_isuffix(s, suffix, sul) : str_is_suffix(s,
suffix, sul);
@@ -3840,7 +3840,7 @@ STRcontains(Client cntxt, MalBlkPtr mb,
const str *arg1 = getArgReference(stk, pci, 1), *arg2 =
getArgReference(stk, pci, 2);
bit icase = pci->argc == 4 && *getArgReference_bit(stk, pci, 3) ? true
: false;
str haystack = *arg1, needle = *arg2, msg = MAL_SUCCEED;
- int needle_len = strlen(needle);
+ int needle_len = str_strlen(needle);
*res = (strNil(haystack) || strNil(needle)) ? bit_nil :
icase ? str_icontains(haystack, needle, needle_len) :
str_contains(haystack, needle, needle_len);
@@ -3879,7 +3879,7 @@ STRstr_search(Client cntxt, MalBlkPtr mb
const str *haystack = getArgReference(stk, pci, 1), *needle =
getArgReference(stk, pci, 2);
bit icase = pci->argc == 4 && *getArgReference_bit(stk, pci, 3) ? true
: false;
str s = *haystack, h = *needle, msg = MAL_SUCCEED;
- int needle_len = strlen(h);
+ int needle_len = str_strlen(h);
*res = (strNil(s) || strNil(h)) ? bit_nil :
icase ? str_isearch(s, h, needle_len) : str_search(s, h,
needle_len);
@@ -3890,7 +3890,7 @@ int
str_reverse_str_search(const char *s, const char *s2, int slen)
{
/* 64bit: should return lng */
- int len = strlen(s);
+ int len = str_strlen(s);
int res = -1; /* changed if found */
if (len >= slen) {
@@ -3909,7 +3909,7 @@ int
str_reverse_str_isearch(const char *s, const char *s2, int slen)
{
/* 64bit: should return lng */
- int len = strlen(s);
+ int len = str_strlen(s);
int res = -1; /* changed if found */
if (len >= slen) {
@@ -3936,7 +3936,7 @@ STRrevstr_search(Client cntxt, MalBlkPtr
const str *needle = getArgReference(stk, pci, 2);
bit icase = pci->argc == 4 && *getArgReference_bit(stk, pci, 3) ? true
: false;
str s = *haystack, h = *needle, msg = MAL_SUCCEED;
- int needle_len = strlen(h);
+ int needle_len = str_strlen(h);
*res = (strNil(s) || strNil(h)) ? bit_nil :
icase ? str_reverse_str_isearch(s, h, needle_len) :
str_reverse_str_search(s, h, needle_len);
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
@@ -1675,7 +1675,7 @@ prefix_or_suffix(Client cntxt, MalBlkPtr
vals[i] = int_nil;
nils = true;
} else {
- vals[i] = func(x, y, strlen(y));
+ vals[i] = func(x, y, str_strlen(y));
}
}
} else {
@@ -1688,7 +1688,7 @@ prefix_or_suffix(Client cntxt, MalBlkPtr
vals[i] = int_nil;
nils = true;
} else {
- vals[i] = func(x, y, strlen(y));
+ vals[i] = func(x, y, str_strlen(y));
}
}
}
@@ -1789,7 +1789,7 @@ prefix_or_suffix_cst(Client cntxt, MalBl
bi = bat_iterator(b);
vals = Tloc(bn, 0);
ynil = strNil(y);
- ylen = strlen(y);
+ ylen = str_strlen(y);
if (ci1.tpe == cand_dense) {
for (BUN i = 0; i < ci1.ncand; i++) {
oid p1 = (canditer_next_dense(&ci1) - off1);
@@ -1921,7 +1921,7 @@ prefix_or_suffix_strcst(Client cntxt, Ma
vals[i] = bit_nil;
nils = true;
} else {
- vals[i] = func(x, y, strlen(y));
+ vals[i] = func(x, y, str_strlen(y));
}
}
} else {
@@ -1933,7 +1933,7 @@ prefix_or_suffix_strcst(Client cntxt, Ma
vals[i] = int_nil;
nils = true;
} else {
- vals[i] = func(x, y, strlen(y));
+ vals[i] = func(x, y, str_strlen(y));
}
}
}
@@ -2030,7 +2030,7 @@ do_string_select(BAT *bn, BAT *b, BAT *s
BUN cnt = 0, ncands = ci->ncand;
oid off = b->hseqbase, *restrict vals = Tloc(bn, 0);
str msg = MAL_SUCCEED;
- int klen = strlen(key);
+ int klen = str_strlen(key);
size_t counter = 0;
lng timeoffset = 0;
@@ -2269,9 +2269,9 @@ batstrjoin(BAT *r1, BAT *r2, BAT *l, BAT
}
if (anti) {
- batstr_join_loop(str_cmp(vl, vr, rlen) == 0, strlen(vr));
+ batstr_join_loop(str_cmp(vl, vr, rlen) == 0, str_strlen(vr));
} else {
- batstr_join_loop(str_cmp(vl, vr, rlen) != 0, strlen(vr));
+ batstr_join_loop(str_cmp(vl, vr, rlen) != 0, str_strlen(vr));
}
bat_iterator_end(&li);
bat_iterator_end(&ri);
@@ -2521,7 +2521,7 @@ search_string_bat(Client cntxt, MalBlkPt
vals[i] = int_nil;
nils = true;
} else {
- vals[i] = func(x, y, strlen(y));
+ vals[i] = func(x, y, str_strlen(y));
}
}
} else {
@@ -2534,7 +2534,7 @@ search_string_bat(Client cntxt, MalBlkPt
vals[i] = int_nil;
nils = true;
} else {
- vals[i] = func(x, y, strlen(y));
+ vals[i] = func(x, y, str_strlen(y));
}
}
}
@@ -2620,7 +2620,7 @@ search_string_bat_cst(Client cntxt, MalB
bi = bat_iterator(b);
vals = Tloc(bn, 0);
ynil = strNil(y);
- ylen = strlen(y);
+ ylen = str_strlen(y);
if (ci1.tpe == cand_dense) {
for (BUN i = 0; i < ci1.ncand; i++) {
oid p1 = (canditer_next_dense(&ci1) - off1);
@@ -2736,7 +2736,7 @@ search_string_bat_strcst(Client cntxt, M
vals[i] = int_nil;
nils = true;
} else {
- vals[i] = func(x, y, strlen(y));
+ vals[i] = func(x, y, str_strlen(y));
}
}
} else {
@@ -2748,7 +2748,7 @@ search_string_bat_strcst(Client cntxt, M
vals[i] = int_nil;
nils = true;
} else {
- vals[i] = func(x, y, strlen(y));
+ vals[i] = func(x, y, str_strlen(y));
}
}
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
