[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
bjori Sun Jun 11 23:46:53 2006 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
Only display visibility for methods
http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.235&r2=1.236&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.235
php-src/ext/reflection/php_reflection.c:1.236
--- php-src/ext/reflection/php_reflection.c:1.235 Sat Jun 10 00:28:28 2006
+++ php-src/ext/reflection/php_reflection.c Sun Jun 11 23:46:53 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.235 2006/06/10 00:28:28 bjori Exp $ */
+/* $Id: php_reflection.c,v 1.236 2006/06/11 23:46:53 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -717,23 +717,27 @@
string_printf(str, "static ");
}
- /* These are mutually exclusive */
- switch (fptr->common.fn_flags & ZEND_ACC_PPP_MASK) {
- case ZEND_ACC_PUBLIC:
- string_printf(str, "public ");
- break;
- case ZEND_ACC_PRIVATE:
- string_printf(str, "private ");
- break;
- case ZEND_ACC_PROTECTED:
- string_printf(str, "protected ");
- break;
- default:
- string_printf(str, " ");
- break;
+ if (fptr->common.scope) {
+ /* These are mutually exclusive */
+ switch (fptr->common.fn_flags & ZEND_ACC_PPP_MASK) {
+ case ZEND_ACC_PUBLIC:
+ string_printf(str, "public ");
+ break;
+ case ZEND_ACC_PRIVATE:
+ string_printf(str, "private ");
+ break;
+ case ZEND_ACC_PROTECTED:
+ string_printf(str, "protected ");
+ break;
+ default:
+ string_printf(str, " ");
+ break;
+ }
+ string_printf(str, "method ");
+ } else {
+ string_printf(str, "function ");
}
- string_printf(str, fptr->common.scope ? "method " : "function ");
if (fptr->op_array.return_reference) {
string_printf(str, "&");
}
@@ -4771,7 +4775,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.235
2006/06/10 00:28:28 bjori Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.236
2006/06/11 23:46:53 bjori Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard string.c
iliaa Sun Jun 11 21:55:50 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard string.c
/php-srcNEWS
Log:
Improved performance of the implode() function on associated arrays by
200-300%.
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.2&r2=1.445.2.14.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.2
php-src/ext/standard/string.c:1.445.2.14.2.3
--- php-src/ext/standard/string.c:1.445.2.14.2.2Sat Jun 10 15:29:06 2006
+++ php-src/ext/standard/string.c Sun Jun 11 21:55:49 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.2 2006/06/10 15:29:06 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.3 2006/06/11 21:55:49 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -894,11 +894,23 @@
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **) &tmp,
&pos) == SUCCESS) {
if ((*tmp)->type != IS_STRING) {
- SEPARATE_ZVAL(tmp);
- convert_to_string(*tmp);
+ if ((*tmp)->type == IS_OBJECT) {
+ int copy;
+ zval expr;
+ zend_make_printable_zval(*tmp, &expr, ©);
+ smart_str_appendl(&implstr, Z_STRVAL(expr),
Z_STRLEN(expr));
+ if (copy) {
+ zval_dtor(&expr);
+ }
+ goto next;
+ } else {
+ SEPARATE_ZVAL(tmp);
+ convert_to_string(*tmp);
+ }
}
smart_str_appendl(&implstr, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+next:
if (++i != numelems) {
smart_str_appendl(&implstr, Z_STRVAL_P(delim),
Z_STRLEN_P(delim));
}
@@ -916,6 +928,7 @@
{
zval **arg1 = NULL, **arg2 = NULL, *delim, *arr;
int argc = ZEND_NUM_ARGS();
+ HashPosition pos;
if (argc < 1 || argc > 2 ||
zend_get_parameters_ex(argc, &arg1, &arg2) == FAILURE) {
@@ -936,12 +949,10 @@
arr = *arg1;
} else {
if (Z_TYPE_PP(arg1) == IS_ARRAY) {
- SEPARATE_ZVAL(arg1);
arr = *arg1;
convert_to_string_ex(arg2);
delim = *arg2;
} else if (Z_TYPE_PP(arg2) == IS_ARRAY) {
- SEPARATE_ZVAL(arg2);
arr = *arg2;
convert_to_string_ex(arg1);
delim = *arg1;
@@ -951,8 +962,12 @@
}
}
+ pos = Z_ARRVAL_P(arr)->pInternalPointer;
+
php_implode(delim, arr, return_value);
+ Z_ARRVAL_P(arr)->pInternalPointer = pos;
+
if (argc == 1) {
FREE_ZVAL(delim);
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.83&r2=1.2027.2.547.2.84&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.83 php-src/NEWS:1.2027.2.547.2.84
--- php-src/NEWS:1.2027.2.547.2.83 Sat Jun 10 15:29:06 2006
+++ php-src/NEWSSun Jun 11 21:55:49 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.2.0
+- Improved performance of the implode() function on associated arrays by
+ 200-300%. (Ilia)
- Improved performance of str_replace() when doing 1 char to 1 char or 1 char
to many chars replacement by 30-40%. (Ilia)
- Added memory_get_peak_usage() function for retrieving peak memory usage of
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard info.c
iliaa Sun Jun 11 20:47:55 2006 UTC
Modified files:
/php-src/ext/standard info.c
Log:
MFB: Fixed ZTS build
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/info.c?r1=1.266&r2=1.267&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.266 php-src/ext/standard/info.c:1.267
--- php-src/ext/standard/info.c:1.266 Sun Jun 11 16:27:41 2006
+++ php-src/ext/standard/info.c Sun Jun 11 20:47:55 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.266 2006/06/11 16:27:41 iliaa Exp $ */
+/* $Id: info.c,v 1.267 2006/06/11 20:47:55 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -156,7 +156,7 @@
if (Z_TYPE_PP(tmp) == IS_ARRAY) {
if (!sapi_module.phpinfo_as_text) {
PUTS("");
-
zend_print_zval_r_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0);
+
zend_print_zval_r_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0
TSRMLS_CC);
PUTS("");
} else {
zend_print_zval_r(*tmp, 0 TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard info.c
iliaa Sun Jun 11 20:47:34 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard info.c
Log:
Fixed ZTS build
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.1&r2=1.249.2.10.2.2&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.1
php-src/ext/standard/info.c:1.249.2.10.2.2
--- php-src/ext/standard/info.c:1.249.2.10.2.1 Sun Jun 11 16:27:16 2006
+++ php-src/ext/standard/info.c Sun Jun 11 20:47:34 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.1 2006/06/11 16:27:16 iliaa Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.2 2006/06/11 20:47:34 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -154,7 +154,7 @@
if (Z_TYPE_PP(tmp) == IS_ARRAY) {
if (!sapi_module.phpinfo_as_text) {
PUTS("");
-
zend_print_zval_r_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0);
+
zend_print_zval_r_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0
TSRMLS_CC);
PUTS("");
} else {
zend_print_zval_r(*tmp, 0 TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard exec.c streamsfuncs.c string.c /ext/zlib zlib.c
bjori Sun Jun 11 20:33:29 2006 UTC
Modified files:
/php-src/ext/zlib zlib.c
/php-src/ext/standard string.c streamsfuncs.c exec.c
Log:
Nuke unused var
http://cvs.php.net/viewcvs.cgi/php-src/ext/zlib/zlib.c?r1=1.196&r2=1.197&diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.196 php-src/ext/zlib/zlib.c:1.197
--- php-src/ext/zlib/zlib.c:1.196 Sat Jun 3 11:19:44 2006
+++ php-src/ext/zlib/zlib.c Sun Jun 11 20:33:29 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.196 2006/06/03 11:19:44 mike Exp $ */
+/* $Id: zlib.c,v 1.197 2006/06/11 20:33:29 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -285,7 +285,7 @@
char *filename;
int filename_len;
long flags = 0;
- char *slashed, buf[8192];
+ char buf[8192];
register int i = 0;
int use_include_path = 0;
php_stream *stream;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.544&r2=1.545&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.544 php-src/ext/standard/string.c:1.545
--- php-src/ext/standard/string.c:1.544 Sat Jun 10 15:51:23 2006
+++ php-src/ext/standard/string.c Sun Jun 11 20:33:29 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.544 2006/06/10 15:51:23 iliaa Exp $ */
+/* $Id: string.c,v 1.545 2006/06/11 20:33:29 bjori Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3520,7 +3520,7 @@
*/
PHPAPI UChar *php_u_strtr(UChar *str, int len, UChar *str_from, int
str_from_len, UChar *str_to, int str_to_len, int trlen, int *outlen TSRMLS_DC)
{
- int i, j;
+ int i;
int can_optimize = 1;
if ((trlen < 1) || (len < 1)) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.77&r2=1.78&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.77
php-src/ext/standard/streamsfuncs.c:1.78
--- php-src/ext/standard/streamsfuncs.c:1.77Wed Apr 19 08:43:05 2006
+++ php-src/ext/standard/streamsfuncs.c Sun Jun 11 20:33:29 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.77 2006/04/19 08:43:05 tony2001 Exp $ */
+/* $Id: streamsfuncs.c,v 1.78 2006/06/11 20:33:29 bjori Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -387,7 +387,7 @@
php_stream *stream;
zval *zsrc;
long maxlen = PHP_STREAM_COPY_ALL, pos = 0;
- int len, newlen;
+ int len;
char *contents = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|ll", &zsrc,
&maxlen, &pos) == FAILURE) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/exec.c?r1=1.119&r2=1.120&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.119 php-src/ext/standard/exec.c:1.120
--- php-src/ext/standard/exec.c:1.119 Sat Apr 29 14:53:26 2006
+++ php-src/ext/standard/exec.c Sun Jun 11 20:33:29 2006
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: exec.c,v 1.119 2006/04/29 14:53:26 fmk Exp $ */
+/* $Id: exec.c,v 1.120 2006/06/11 20:33:29 bjori Exp $ */
#include
#include "php.h"
@@ -59,7 +59,7 @@
int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_DC)
{
FILE *fp;
- char *buf, *tmp=NULL;
+ char *buf;
int l, pclose_return;
char *cmd_p, *b, *d=NULL;
php_stream *stream;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date php_date.c
bjori Sun Jun 11 20:12:17 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/date php_date.c Log: MFH: fix typo http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.7&r2=1.43.2.45.2.8&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.7 php-src/ext/date/php_date.c:1.43.2.45.2.8 --- php-src/ext/date/php_date.c:1.43.2.45.2.7 Sun Jun 11 01:42:16 2006 +++ php-src/ext/date/php_date.c Sun Jun 11 20:12:17 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.7 2006/06/11 01:42:16 bjori Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.8 2006/06/11 20:12:17 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -157,7 +157,7 @@ PHP_FE(checkdate, arginfo_checkdate) #ifdef HAVE_STRFTIME - PHP_FE(strftime, arginfo_strtotime) + PHP_FE(strftime, arginfo_strftime) PHP_FE(gmstrftime, arginfo_gmstrftime) #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
bjori Sun Jun 11 20:11:52 2006 UTC Modified files: /php-src/ext/date php_date.c Log: Fix typo http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.97&r2=1.98&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.97 php-src/ext/date/php_date.c:1.98 --- php-src/ext/date/php_date.c:1.97Sat Jun 10 22:59:40 2006 +++ php-src/ext/date/php_date.c Sun Jun 11 20:11:52 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.97 2006/06/10 22:59:40 bjori Exp $ */ +/* $Id: php_date.c,v 1.98 2006/06/11 20:11:52 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -158,7 +158,7 @@ PHP_FE(checkdate, arginfo_checkdate) #ifdef HAVE_STRFTIME - PHP_FE(strftime, arginfo_strtotime) + PHP_FE(strftime, arginfo_strftime) PHP_FE(gmstrftime, arginfo_gmstrftime) #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ftp php_ftp.c /ext/gd gd.c
bjori Sun Jun 11 20:03:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ftpphp_ftp.c
/php-src/ext/gd gd.c
Log:
MFH: argument infos
http://cvs.php.net/viewcvs.cgi/php-src/ext/ftp/php_ftp.c?r1=1.103.2.2&r2=1.103.2.2.2.1&diff_format=u
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.103.2.2
php-src/ext/ftp/php_ftp.c:1.103.2.2.2.1
--- php-src/ext/ftp/php_ftp.c:1.103.2.2 Sun Jan 1 12:50:06 2006
+++ php-src/ext/ftp/php_ftp.c Sun Jun 11 20:03:05 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_ftp.c,v 1.103.2.2 2006/01/01 12:50:06 sniper Exp $ */
+/* $Id: php_ftp.c,v 1.103.2.2.2.1 2006/06/11 20:03:05 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -44,50 +44,273 @@
static int le_ftpbuf;
#define le_ftpbuf_name "FTP Buffer"
+/* {{{ arginfo */
static
-ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1)
-ZEND_ARG_PASS_INFO(0)
-ZEND_ARG_PASS_INFO(0)
-ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_connect, 0, 0, 1)
+ ZEND_ARG_INFO(0, host)
+ ZEND_ARG_INFO(0, port)
+ ZEND_ARG_INFO(0, timeout)
+ZEND_END_ARG_INFO()
+
+#if HAVE_OPENSSL_EXT
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_ssl_connect, 0, 0, 1)
+ ZEND_ARG_INFO(0, host)
+ ZEND_ARG_INFO(0, port)
+ ZEND_ARG_INFO(0, timeout)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_login, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, username)
+ ZEND_ARG_INFO(0, password)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_pwd, 0)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_cdup, 0)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_chdir, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_exec, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, command)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_raw, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, command)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_mkdir, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_rmdir, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_chmod, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_alloc, 0, 0, 2)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, size)
+ ZEND_ARG_INFO(1, response)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_nlist, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_rawlist, 0, 0, 2)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ ZEND_ARG_INFO(0, recursive)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_systype, 0)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fget, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, fp)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, resumepos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fget, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, fp)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, resumepos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_pasv, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, pasv)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_get, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, local_file)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, resume_pos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_get, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, local_file)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, resume_pos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_nb_continue, 0)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fput, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, fp)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, startpos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fput, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, fp
[PHP-CVS] cvs: php-src /ext/ftp php_ftp.c /ext/gd gd.c
bjori Sun Jun 11 19:59:53 2006 UTC
Modified files:
/php-src/ext/ftpphp_ftp.c
/php-src/ext/gd gd.c
Log:
Added argument info
Fixed protos & vim folding
http://cvs.php.net/viewcvs.cgi/php-src/ext/ftp/php_ftp.c?r1=1.106&r2=1.107&diff_format=u
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.106 php-src/ext/ftp/php_ftp.c:1.107
--- php-src/ext/ftp/php_ftp.c:1.106 Sun Feb 19 04:29:40 2006
+++ php-src/ext/ftp/php_ftp.c Sun Jun 11 19:59:53 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_ftp.c,v 1.106 2006/02/19 04:29:40 andi Exp $ */
+/* $Id: php_ftp.c,v 1.107 2006/06/11 19:59:53 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -44,50 +44,273 @@
static int le_ftpbuf;
#define le_ftpbuf_name "FTP Buffer"
+/* {{{ arginfo */
static
-ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1)
-ZEND_ARG_PASS_INFO(0)
-ZEND_ARG_PASS_INFO(0)
-ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_connect, 0, 0, 1)
+ ZEND_ARG_INFO(0, host)
+ ZEND_ARG_INFO(0, port)
+ ZEND_ARG_INFO(0, timeout)
+ZEND_END_ARG_INFO()
+
+#if HAVE_OPENSSL_EXT
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_ssl_connect, 0, 0, 1)
+ ZEND_ARG_INFO(0, host)
+ ZEND_ARG_INFO(0, port)
+ ZEND_ARG_INFO(0, timeout)
+ZEND_END_ARG_INFO()
+#endif
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_login, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, username)
+ ZEND_ARG_INFO(0, password)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_pwd, 0)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_cdup, 0)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_chdir, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_exec, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, command)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_raw, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, command)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_mkdir, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_rmdir, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_chmod, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, filename)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_alloc, 0, 0, 2)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, size)
+ ZEND_ARG_INFO(1, response)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_nlist, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_rawlist, 0, 0, 2)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, directory)
+ ZEND_ARG_INFO(0, recursive)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_systype, 0)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fget, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, fp)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, resumepos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fget, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, fp)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, resumepos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_pasv, 0)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, pasv)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_get, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, local_file)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, resume_pos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_get, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, local_file)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, resume_pos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_ftp_nb_continue, 0)
+ ZEND_ARG_INFO(0, ftp)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_fput, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, fp)
+ ZEND_ARG_INFO(0, mode)
+ ZEND_ARG_INFO(0, startpos)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_ftp_nb_fput, 0, 0, 4)
+ ZEND_ARG_INFO(0, ftp)
+ ZEND_ARG_INFO(0, remote_file)
+ ZEND_ARG_INFO(0, fp)
+ ZEND_ARG_INFO(0,
[PHP-CVS] cvs: php-src /ext/standard info.c
iliaa Sun Jun 11 16:27:41 2006 UTC
Modified files:
/php-src/ext/standard info.c
Log:
MFB: Fully print array() in phpinfo().
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/info.c?r1=1.265&r2=1.266&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.265 php-src/ext/standard/info.c:1.266
--- php-src/ext/standard/info.c:1.265 Sat Jun 3 11:19:43 2006
+++ php-src/ext/standard/info.c Sun Jun 11 16:27:41 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.265 2006/06/03 11:19:43 mike Exp $ */
+/* $Id: info.c,v 1.266 2006/06/11 16:27:41 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -156,7 +156,7 @@
if (Z_TYPE_PP(tmp) == IS_ARRAY) {
if (!sapi_module.phpinfo_as_text) {
PUTS("");
- zend_print_zval_ex((zend_write_func_t)
php_info_write_wrapper, *tmp, 0);
+
zend_print_zval_r_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0);
PUTS("");
} else {
zend_print_zval_r(*tmp, 0 TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard info.c
iliaa Sun Jun 11 16:27:16 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard info.c
Log:
Fully print array() in phpinfo().
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/info.c?r1=1.249.2.10&r2=1.249.2.10.2.1&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10
php-src/ext/standard/info.c:1.249.2.10.2.1
--- php-src/ext/standard/info.c:1.249.2.10 Fri Mar 31 11:11:12 2006
+++ php-src/ext/standard/info.c Sun Jun 11 16:27:16 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10 2006/03/31 11:11:12 tony2001 Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.1 2006/06/11 16:27:16 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -154,7 +154,7 @@
if (Z_TYPE_PP(tmp) == IS_ARRAY) {
if (!sapi_module.phpinfo_as_text) {
PUTS("");
- zend_print_zval_ex((zend_write_func_t)
php_info_write_wrapper, *tmp, 0);
+
zend_print_zval_r_ex((zend_write_func_t) php_info_write_wrapper, *tmp, 0);
PUTS("");
} else {
zend_print_zval_r(*tmp, 0 TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
