tony2001 Tue Jun 5 13:35:26 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard string.c Log: fix folding http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.59&r2=1.445.2.14.2.60&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.59 php-src/ext/standard/string.c:1.445.2.14.2.60 --- php-src/ext/standard/string.c:1.445.2.14.2.59 Sun Jun 3 18:47:10 2007 +++ php-src/ext/standard/string.c Tue Jun 5 13:35:26 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.445.2.14.2.59 2007/06/03 18:47:10 iliaa Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.60 2007/06/05 13:35:26 tony2001 Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -204,7 +204,7 @@ } /* }}} */ -static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior) +static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior) /* {{{ */ { char *s11, *s22; int len1, len2; @@ -256,6 +256,7 @@ } } +/* }}} */ /* {{{ proto int strspn(string str, string mask [, start [, len]]) Finds length of initial segment consisting entirely of characters found in mask. If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) */ @@ -831,7 +832,6 @@ } /* }}} */ - /* {{{ proto array explode(string separator, string str [, int limit]) Splits a string on string separator and return array of components. If limit is positive only limit number of components is returned. If limit is negative all components except the last abs(limit) are returned. */ PHP_FUNCTION(explode) @@ -2122,7 +2122,6 @@ } /* }}} */ - /* {{{ proto mixed substr_replace(mixed str, mixed repl, mixed start [, mixed length]) Replaces part of a string with another string */ PHP_FUNCTION(substr_replace) @@ -2354,9 +2353,6 @@ } /* }}} */ - - - /* {{{ proto string quotemeta(string str) Quotes meta characters */ PHP_FUNCTION(quotemeta) @@ -3402,8 +3398,7 @@ { return php_str_to_str_ex(haystack, length, needle, needle_len, str, str_len, _new_length, 1, NULL); } -/* }}} - */ +/* }}} */ /* {{{ php_str_replace_in_subject */ @@ -3812,7 +3807,6 @@ } /* }}} */ - /* {{{ proto string nl2br(string str) Converts newlines to HTML line breaks */ PHP_FUNCTION(nl2br) @@ -3888,7 +3882,6 @@ } /* }}} */ - /* {{{ proto string strip_tags(string str [, string allowable_tags]) Strips HTML and PHP tags from a string */ PHP_FUNCTION(strip_tags) @@ -4127,10 +4120,11 @@ } /* }}} */ -PHPAPI size_t php_strip_tags(char *rbuf, int len, int *stateptr, char *allow, int allow_len) +PHPAPI size_t php_strip_tags(char *rbuf, int len, int *stateptr, char *allow, int allow_len) /* {{{ */ { return php_strip_tags_ex(rbuf, len, stateptr, allow, allow_len, 0); } +/* }}} */ /* {{{ php_strip_tags @@ -4854,8 +4848,7 @@ } /* }}} */ - -static void php_string_shuffle(char *str, long len TSRMLS_DC) +static void php_string_shuffle(char *str, long len TSRMLS_DC) /* {{{ */ { long n_elems, rnd_idx, n_left; char temp; @@ -4879,7 +4872,7 @@ } } } - +/* }}} */ /* {{{ proto void str_shuffle(string str) Shuffles string. One permutation of all possible is created */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php