Revert "Optimize str_strstr()"

Partial revert of commit 418922f

Reason: premature optimization :) new implementation was actually slower

Author: liviuchircu

ut.h

@@ -1178,7 +1178,8 @@ static inline int str_casematch_nt(const str *a, const char *b)
  */
 static inline char* str_strstr(const str *stra, const str *strb)
 {
-	char *a, *ai, *b, *bi, *end1, *end2;
+	int i;
+	int len;
 
 	if (stra==NULL || strb==NULL || stra->s==NULL || strb->s==NULL
 			|| stra->len<=0 || strb->len<=0) {
@@ -1191,20 +1192,26 @@ static inline char* str_strstr(const str *stra, const str *strb)
 	if (strb->len > stra->len)
 		return NULL;
 
-	a = stra->s;
-	b = strb->s;
-	end1 = a + stra->len - strb->len + 1;
-	end2 = b + strb->len;
+	len=0;
+	while (stra->len-len >= strb->len){
+		if (stra->s[len] != strb->s[0]) {
+			len++;
+			continue;
+		}
+
+		for (i=1; i<strb->len; i++)
+			if (stra->s[len+i]!=strb->s[i]) {
+				len++;
+				break;
+			}
 
-	for (; a < end1; a++) {
-		ai = a;
-		bi = b;
-		while ((*ai++ == *bi) && ++bi < end2) ;
+		if (i != strb->len)
+			continue;
 
-		if (bi == end2)
-			return a;
+		return stra->s+len;
 	}
 
+
 	return NULL;
 }