summaryrefslogtreecommitdiff
path: root/ext/standard/string.c
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-11-25 08:37:02 +0000
committerkrakjoe <joe.watkins@live.co.uk>2014-11-25 08:37:02 +0000
commite07feeaf8b91f16a89e9903b461042a0f6a63ac0 (patch)
tree4a94cd382fcffefff920f7733562e1860a66cc44 /ext/standard/string.c
parent9b6836ebd36eccc9e81ca51e2efe172e1d334f0b (diff)
parentd4f42289ddde002cb4d3ed9d1a4f2219f68df48e (diff)
downloadphp-git-e07feeaf8b91f16a89e9903b461042a0f6a63ac0.tar.gz
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'ext/standard/string.c')
-rw-r--r--ext/standard/string.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 152ae6d66f..c5c6520cf7 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2807,7 +2807,7 @@ static void php_strtr_array(zval *return_value, char *str, size_t slen, HashTabl
char *key;
smart_str result = {0};
- /* we will collect all possible key lenghts */
+ /* we will collect all possible key lengths */
ZVAL_NULL(&dummy);
zend_hash_init(&num_hash, 8, NULL, NULL, 0);
@@ -2829,7 +2829,7 @@ static void php_strtr_array(zval *return_value, char *str, size_t slen, HashTabl
if (len < minlen) {
minlen = len;
}
- /* remember possible key lenght */
+ /* remember possible key length */
zend_hash_index_add(&num_hash, len, &dummy);
}
} ZEND_HASH_FOREACH_END();
@@ -2854,7 +2854,7 @@ static void php_strtr_array(zval *return_value, char *str, size_t slen, HashTabl
if (len < minlen) {
minlen = len;
}
- /* remember possible key lenght */
+ /* remember possible key length */
zend_hash_index_add(&num_hash, len, &dummy);
} else {
len = str_key->len;