cvs: php-src /ext/standard string.c
| From: | Marcus Boerger | Date: | Thu, 10 Mar 2005 23:52:45 +0000 |
| Subject: | cvs: php-src /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30852@lists.php.net to get a copy of this message | ||
helly Thu Mar 10 18:52:45 2005 EDT
Modified files:
/php-src/ext/standard string.c
Log:
- Cosmetics
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.430&r2=1.431&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.430 php-src/ext/standard/string.c:1.431
--- php-src/ext/standard/string.c:1.430 Thu Mar 10 18:42:15 2005
+++ php-src/ext/standard/string.c Thu Mar 10 18:52:43 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.430 2005/03/10 23:42:15 helly Exp $ */
+/* $Id: string.c,v 1.431 2005/03/10 23:52:43 helly Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1343,7 +1343,7 @@
}
if (opt == PHP_PATHINFO_ALL) {
- RETVAL_ZVAL(tmp, 1, 0);
+ RETURN_ZVAL(tmp, 0, 1);
} else {
zval **element;
if (zend_hash_get_current_data(Z_ARRVAL_P(tmp), (void **) &element) == SUCCESS) {
@@ -4486,8 +4486,7 @@
/* If resulting string turns out to be shorter than input string,
we simply copy the input and return. */
if (num_pad_chars < 0) {
- RETVAL_ZVAL(*input, 1, 0);
- return;
+ RETURN_ZVAL(*input, 1, 0);
}
/* Setup the padding string values if specified. */