From: Xinchen Hui <laruence@php.net>
Date: Mon, 19 Jan 2015 12:45:30 +0000 (-0500)
Subject: Optimized trim for what_len == 1
X-Git-Tag: PRE_PHP7_REMOVALS~25^2~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac9a1a7b0c54b6e7f0ddfdc8403fef354eb03d9e;p=php

Optimized trim for what_len == 1
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index f746a242fc..a9b4cfe8d0 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -797,29 +797,55 @@ PHPAPI zend_string *php_trim(zend_string *str, char *what, size_t what_len, int
 	char mask[256];
 
 	if (what) {
-		php_charmask((unsigned char*)what, what_len, mask);
-
-		if (mode & 1) {
-			for (i = 0; i < len; i++) {
-				if (mask[(unsigned char)c[i]]) {
-					trimmed++;
-				} else {
-					break;
+		if (what_len == 1) {
+			if (mode & 1) {
+				for (i = 0; i < len; i++) {
+					if (c[i] == *what) {
+						trimmed++;
+					} else {
+						break;
+					}
 				}
+				len -= trimmed;
+				c += trimmed;
 			}
-			len -= trimmed;
-			c += trimmed;
-		}
-		if (mode & 2) {
-			if (len > 0) {
-				i = len - 1;
-				do {
+			if (mode & 2) {
+				if (len > 0) {
+					i = len - 1;
+					do {
+						if (c[i] == *what) {
+							len--;
+						} else {
+							break;
+						}
+					} while (i-- != 0);
+				}
+			}
+		} else {
+			php_charmask((unsigned char*)what, what_len, mask);
+
+			if (mode & 1) {
+				for (i = 0; i < len; i++) {
 					if (mask[(unsigned char)c[i]]) {
-						len--;
+						trimmed++;
 					} else {
 						break;
 					}
-				} while (i-- != 0);
+				}
+				len -= trimmed;
+				c += trimmed;
+			}
+			if (mode & 2) {
+				if (len > 0) {
+					i = len - 1;
+					do {
+						if (mask[(unsigned char)c[i]]) {
+							len--;
+						} else {
+							break;
+						}
+					} while (i-- != 0);
+				}
 			}
 		}
 	} else {