[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c

[Jani Taskinen]

jani            Mon Oct  1 13:38:15 2007 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard       string.c 
  Log:
  - ws + cs + sync HEAD
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.2&r2=1.445.2.14.2.69.2.3&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.2 
php-src/ext/standard/string.c:1.445.2.14.2.69.2.3
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.2   Mon Oct  1 12:05:41 2007
+++ php-src/ext/standard/string.c       Mon Oct  1 13:38:14 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.445.2.14.2.69.2.2 2007/10/01 12:05:41 jani Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.3 2007/10/01 13:38:14 jani Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2181,8 +2181,7 @@
 
        if (Z_TYPE_PP(str) == IS_STRING) {
                if (
-                       (argc == 3 && Z_TYPE_PP(from) == IS_ARRAY) 
-                       || 
+                       (argc == 3 && Z_TYPE_PP(from) == IS_ARRAY) || 
                        (argc == 4 && Z_TYPE_PP(from) != Z_TYPE_PP(len))
                ) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "'from' and 
'len' should be of same type - numerical or array ");
@@ -2195,7 +2194,6 @@
                        }
                }
        }
-
        
        if (Z_TYPE_PP(str) != IS_ARRAY) {
                if (Z_TYPE_PP(from) != IS_ARRAY) {
@@ -5127,12 +5125,12 @@
                offset = (offset < 0) ? 0 : offset;
        }
 
-       if(offset > s1_len) {
+       if (offset > s1_len) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "The start position 
cannot exceed initial string length");
                RETURN_FALSE;
        }
 
-       if(len > s1_len - offset) {
+       if (len > s1_len - offset) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length cannot 
exceed initial string length");
                RETURN_FALSE;
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php