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

[Antony Dovgal]

tony2001                Fri Aug 12 12:46:44 2005 EDT

  Modified files:              
    /php-src/ext/standard       string.c 
  Log:
  fix php_u_trim() and compile warnings 
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.450&r2=1.451&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.450 php-src/ext/standard/string.c:1.451
--- php-src/ext/standard/string.c:1.450 Fri Aug 12 09:41:15 2005
+++ php-src/ext/standard/string.c       Fri Aug 12 12:46:38 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.450 2005/08/12 13:41:15 dmitry Exp $ */
+/* $Id: string.c,v 1.451 2005/08/12 16:46:38 tony2001 Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -718,12 +718,12 @@
                }
        } else { /* Trimmed the whole string */
                if ( return_value ) {
-                       RETURN_EMPTY_UNICODE();
+                       RETVAL_EMPTY_UNICODE();
                } else {
                        return (USTR_MAKE(""));
                }
        }
-
+       return (USTR_MAKE(""));
 }
 /* }}} */
 
@@ -1911,7 +1911,7 @@
                        case IS_UNICODE:
                                found_offset = (UChar*)found - (UChar*)haystack;
                                if (part) {
-                                       char *ret;
+                                       UChar *ret;
                                        ret = eumalloc(found_offset + 1);
                                        u_strncpy(ret, haystack, found_offset);
                                        ret[found_offset] = '\0';

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