Changeset: 7fadddfbc8a8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7fadddfbc8a8
Modified Files:
monetdb5/modules/atoms/str.c
Branch: txtsim
Log Message:
windows compilation fixes (no strcasestr, but we needed utf8casestr anyway)
diffs (45 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
@@ -3747,7 +3747,6 @@ str_is_prefix(const char *s, const char
bit
str_is_iprefix(const char *s, const char *prefix, int plen)
{
- //return strncasecmp(s, prefix, plen) == 0;
return utf8ncasecmp(s, prefix, plen) == 0;
}
@@ -3786,7 +3785,6 @@ str_is_isuffix(const char *s, const char
if (sl < sul)
return 0;
else
- //return strcasecmp(s + sl - sul, suffix) == 0;
return utf8casecmp(s + sl - sul, suffix) == 0;
}
@@ -3824,7 +3822,7 @@ str_icontains(const char *h, const char
{
(void)nlen;
/* 64bit: should return lng */
- if (strcasestr(h, n) != NULL)
+ if (utf8casestr(h, n) != NULL)
return TRUE;
else
return FALSE;
@@ -3863,7 +3861,7 @@ str_isearch(const char *s, const char *s
{
(void)slen;
/* 64bit: should return lng */
- if ((s2 = strcasestr(s, s2)) != NULL)
+ if ((s2 = utf8casestr(s, s2)) != NULL)
return UTF8_strpos(s, s2);
else
return -1;
@@ -3915,7 +3913,6 @@ str_reverse_str_isearch(const char *s, c
if (len >= slen) {
const char *p = s + len - slen;
do {
- //if (strncasecmp(p, s2, slen) == 0) {
if (utf8ncasecmp(p, s2, slen) == 0) {
res = UTF8_strpos(s, p);
break;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
