felipe Mon Mar 10 22:12:37 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache2handler php_functions.c
/php-src/sapi/apache_hooks php_apache.c
/php-src/main output.c
/php-src/ext/com_dotnet com_com.c
/php-src/ext/curl multi.c
/php-src/ext/date php_date.c
/php-src/ext/dba dba.c
/php-src/ext/dom php_dom.h
/php-src/ext/fdf fdf.c
/php-src/ext/filter filter.c
/php-src/ext/gd gd.c
/php-src/ext/imap php_imap.c
/php-src/ext/interbase interbase.c
/php-src/ext/mhash mhash.c
/php-src/ext/ming ming.c
/php-src/ext/msql php_msql.c
/php-src/ext/odbc php_odbc.c
/php-src/ext/openssl openssl.c
/php-src/ext/pdo pdo_dbh.c pdo_stmt.c
/php-src/ext/posix posix.c
/php-src/ext/session session.c
/php-src/ext/skeleton create_stubs
/php-src/ext/snmp snmp.c
/php-src/ext/soap soap.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/standard basic_functions.c dir.c filestat.c head.c
info.c rand.c streamsfuncs.c string.c
syslog.c user_filters.c
/php-src/ext/tidy tidy.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-src/ext/xmlwriter php_xmlwriter.c
Log:
MFH: New way for check void parameters
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6.2.5.2.2&r2=1.18.2.6.2.5.2.3&diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.2
php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.3
--- php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.5.2.2 Mon Dec
31 07:17:18 2007
+++ php-src/sapi/apache2handler/php_functions.c Mon Mar 10 22:12:33 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.18.2.6.2.5.2.2 2007/12/31 07:17:18 sebastian Exp $
*/
+/* $Id: php_functions.c,v 1.18.2.6.2.5.2.3 2008/03/10 22:12:33 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -179,8 +179,8 @@
const apr_array_header_t *arr;
char *key, *val;
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
@@ -203,8 +203,8 @@
const apr_array_header_t *arr;
char *key, *val;
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.2&r2=1.19.2.3.2.5.2.3&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.2
php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.3
--- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.2 Mon Dec 31
07:17:18 2007
+++ php-src/sapi/apache_hooks/php_apache.c Mon Mar 10 22:12:33 2008
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.19.2.3.2.5.2.2 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.5.2.3 2008/03/10 22:12:33 felipe Exp $ */
#include "php_apache_http.h"
@@ -164,8 +164,8 @@
request_rec *r;
char *s;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -224,8 +224,8 @@
request_rec *r;
long l;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -683,8 +683,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -766,8 +766,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -784,8 +784,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -802,8 +802,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -819,8 +819,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -836,8 +836,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -854,8 +854,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -871,8 +871,8 @@
zval *id;
request_rec *r;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -889,8 +889,8 @@
request_rec *r;
char *t;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
@@ -911,8 +911,8 @@
request_rec *r;
char *t;
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
APREQ_GET_REQUEST(id, r);
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.4.2.2&r2=1.167.2.3.2.4.2.3&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.167.2.3.2.4.2.2
php-src/main/output.c:1.167.2.3.2.4.2.3
--- php-src/main/output.c:1.167.2.3.2.4.2.2 Mon Dec 31 07:17:17 2007
+++ php-src/main/output.c Mon Mar 10 22:12:33 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.167.2.3.2.4.2.2 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: output.c,v 1.167.2.3.2.4.2.3 2008/03/10 22:12:33 felipe Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -758,8 +758,8 @@
Flush (send) contents of the output buffer. The last buffer content is sent
to next buffer */
PHP_FUNCTION(ob_flush)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (!OG(ob_nesting_level)) {
@@ -777,8 +777,8 @@
Clean (delete) the current output buffer */
PHP_FUNCTION(ob_clean)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (!OG(ob_nesting_level)) {
@@ -800,8 +800,8 @@
Flush (send) the output buffer, and delete current output buffer */
PHP_FUNCTION(ob_end_flush)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (!OG(ob_nesting_level)) {
@@ -822,8 +822,8 @@
Clean the output buffer, and delete current output buffer */
PHP_FUNCTION(ob_end_clean)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (!OG(ob_nesting_level)) {
@@ -844,8 +844,8 @@
Get current buffer contents, flush (send) the output buffer, and delete
current output buffer */
PHP_FUNCTION(ob_get_flush)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
/* get contents */
@@ -870,9 +870,9 @@
Get current buffer contents and delete current output buffer */
PHP_FUNCTION(ob_get_clean)
{
- if (ZEND_NUM_ARGS() != 0)
- ZEND_WRONG_PARAM_COUNT();
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
/* get contents */
if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) {
RETURN_FALSE;
@@ -895,8 +895,8 @@
Return the contents of the output buffer */
PHP_FUNCTION(ob_get_contents)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) {
@@ -909,8 +909,8 @@
Return the nesting level of the output buffer */
PHP_FUNCTION(ob_get_level)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_LONG (OG(ob_nesting_level));
@@ -921,8 +921,8 @@
Return the length of the output buffer */
PHP_FUNCTION(ob_get_length)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (php_ob_get_length(return_value TSRMLS_CC)==FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_com.c?r1=1.16.2.2.2.5.2.2&r2=1.16.2.2.2.5.2.3&diff_format=u
Index: php-src/ext/com_dotnet/com_com.c
diff -u php-src/ext/com_dotnet/com_com.c:1.16.2.2.2.5.2.2
php-src/ext/com_dotnet/com_com.c:1.16.2.2.2.5.2.3
--- php-src/ext/com_dotnet/com_com.c:1.16.2.2.2.5.2.2 Mon Dec 31 07:17:06 2007
+++ php-src/ext/com_dotnet/com_com.c Mon Mar 10 22:12:33 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_com.c,v 1.16.2.2.2.5.2.2 2007/12/31 07:17:06 sebastian Exp $ */
+/* $Id: com_com.c,v 1.16.2.2.2.5.2.3 2008/03/10 22:12:33 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -658,8 +658,8 @@
GUID retval;
OLECHAR *guid_string;
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
php_com_initialize(TSRMLS_C);
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/multi.c?r1=1.19.2.3.2.7.2.2&r2=1.19.2.3.2.7.2.3&diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.19.2.3.2.7.2.2
php-src/ext/curl/multi.c:1.19.2.3.2.7.2.3
--- php-src/ext/curl/multi.c:1.19.2.3.2.7.2.2 Mon Dec 31 07:17:06 2007
+++ php-src/ext/curl/multi.c Mon Mar 10 22:12:33 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: multi.c,v 1.19.2.3.2.7.2.2 2007/12/31 07:17:06 sebastian Exp $ */
+/* $Id: multi.c,v 1.19.2.3.2.7.2.3 2008/03/10 22:12:33 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -55,8 +55,8 @@
{
php_curlm *mh;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
mh = ecalloc(1, sizeof(php_curlm));
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.23&r2=1.43.2.45.2.51.2.24&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.51.2.23
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.24
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.23 Sun Mar 9 18:09:53 2008
+++ php-src/ext/date/php_date.c Mon Mar 10 22:12:33 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.23 2008/03/09 18:09:53 iliaa Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.24 2008/03/10 22:12:33 felipe Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -298,8 +298,8 @@
php_date_obj *obj; \
DATE_SET_CONTEXT; \
if (object) { \
- if (ZEND_NUM_ARGS()) { \
- WRONG_PARAM_COUNT; \
+ if (zend_parse_parameters_none() == FAILURE) { \
+ return; \
} \
} else { \
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
NULL, "O", &object, date_ce_date) == FAILURE) { \
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/dba.c?r1=1.111.2.4.2.5.2.2&r2=1.111.2.4.2.5.2.3&diff_format=u
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.111.2.4.2.5.2.2
php-src/ext/dba/dba.c:1.111.2.4.2.5.2.3
--- php-src/ext/dba/dba.c:1.111.2.4.2.5.2.2 Mon Dec 31 07:17:07 2007
+++ php-src/ext/dba/dba.c Mon Mar 10 22:12:33 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.111.2.4.2.5.2.2 2007/12/31 07:17:07 sebastian Exp $ */
+/* $Id: dba.c,v 1.111.2.4.2.5.2.3 2008/03/10 22:12:33 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1200,8 +1200,7 @@
zend_rsrc_list_entry *le;
dba_info *info;
- if (ZEND_NUM_ARGS()!=0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/php_dom.h?r1=1.28.2.1.2.4.2.2&r2=1.28.2.1.2.4.2.3&diff_format=u
Index: php-src/ext/dom/php_dom.h
diff -u php-src/ext/dom/php_dom.h:1.28.2.1.2.4.2.2
php-src/ext/dom/php_dom.h:1.28.2.1.2.4.2.3
--- php-src/ext/dom/php_dom.h:1.28.2.1.2.4.2.2 Fri Jan 25 16:13:04 2008
+++ php-src/ext/dom/php_dom.h Mon Mar 10 22:12:33 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.h,v 1.28.2.1.2.4.2.2 2008/01/25 16:13:04 rrichards Exp $ */
+/* $Id: php_dom.h,v 1.28.2.1.2.4.2.3 2008/03/10 22:12:33 felipe Exp $ */
#ifndef PHP_DOM_H
#define PHP_DOM_H
@@ -138,8 +138,7 @@
}
#define DOM_NO_ARGS() \
- if (ZEND_NUM_ARGS() != 0) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expects exactly 0
parameters, %d given", ZEND_NUM_ARGS()); \
+ if (zend_parse_parameters_none() == FAILURE) { \
return; \
}
http://cvs.php.net/viewvc.cgi/php-src/ext/fdf/fdf.c?r1=1.89.2.2.2.9.2.2&r2=1.89.2.2.2.9.2.3&diff_format=u
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.89.2.2.2.9.2.2
php-src/ext/fdf/fdf.c:1.89.2.2.2.9.2.3
--- php-src/ext/fdf/fdf.c:1.89.2.2.2.9.2.2 Mon Dec 31 07:17:08 2007
+++ php-src/ext/fdf/fdf.c Mon Mar 10 22:12:33 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fdf.c,v 1.89.2.2.2.9.2.2 2007/12/31 07:17:08 sebastian Exp $ */
+/* $Id: fdf.c,v 1.89.2.2.2.9.2.3 2008/03/10 22:12:33 felipe Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -528,8 +528,8 @@
FDFDoc fdf;
FDFErc err;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
err = FDFCreate(&fdf);
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.39.2.5&r2=1.52.2.39.2.6&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.39.2.5
php-src/ext/filter/filter.c:1.52.2.39.2.6
--- php-src/ext/filter/filter.c:1.52.2.39.2.5 Sun Feb 24 18:41:08 2008
+++ php-src/ext/filter/filter.c Mon Mar 10 22:12:34 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.39.2.5 2008/02/24 18:41:08 felipe Exp $ */
+/* $Id: filter.c,v 1.52.2.39.2.6 2008/03/10 22:12:34 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -275,7 +275,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.5 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.6 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -835,8 +835,8 @@
{
int i, size = sizeof(filter_list) / sizeof(filter_list_entry);
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.2&r2=1.312.2.20.2.32.2.3&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.2
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.3
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.2 Mon Dec 31 07:17:08 2007
+++ php-src/ext/gd/gd.c Mon Mar 10 22:12:34 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.2 2007/12/31 07:17:08 sebastian Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.3 2008/03/10 22:12:34 felipe Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1440,8 +1440,7 @@
*/
PHP_FUNCTION(gd_info)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
RETURN_FALSE;
}
@@ -2383,8 +2382,8 @@
ret |= 16;
#endif
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_LONG(ret);
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.26.2.3&r2=1.208.2.7.2.26.2.4&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.3
php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.4
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.26.2.3 Thu Jan 31 18:46:03 2008
+++ php-src/ext/imap/php_imap.c Mon Mar 10 22:12:34 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.208.2.7.2.26.2.3 2008/01/31 18:46:03 nlopess Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.26.2.4 2008/03/10 22:12:34 felipe Exp $ */
#define IMAP41
@@ -3658,8 +3658,8 @@
{
STRINGLIST *cur=NIL;
- if (ZEND_NUM_ARGS() > 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (IMAPG(imap_alertstack) == NIL) {
@@ -3685,8 +3685,8 @@
{
ERRORLIST *cur=NIL;
- if (ZEND_NUM_ARGS() > 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (IMAPG(imap_errorstack) == NIL) {
@@ -3712,8 +3712,8 @@
{
ERRORLIST *cur=NIL;
- if (ZEND_NUM_ARGS() > 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (IMAPG(imap_errorstack) == NIL) {
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/interbase.c?r1=1.225.2.4.2.7.2.2&r2=1.225.2.4.2.7.2.3&diff_format=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.2
php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.3
--- php-src/ext/interbase/interbase.c:1.225.2.4.2.7.2.2 Mon Dec 31 07:17:09 2007
+++ php-src/ext/interbase/interbase.c Mon Mar 10 22:12:34 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.225.2.4.2.7.2.2 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: interbase.c,v 1.225.2.4.2.7.2.3 2008/03/10 22:12:34 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -203,8 +203,8 @@
Return error message */
PHP_FUNCTION(ibase_errmsg)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (IBG(sql_code) != 0) {
@@ -219,8 +219,8 @@
Return error code */
PHP_FUNCTION(ibase_errcode)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (IBG(sql_code) != 0) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mhash/mhash.c?r1=1.48.2.3.2.5.2.2&r2=1.48.2.3.2.5.2.3&diff_format=u
Index: php-src/ext/mhash/mhash.c
diff -u php-src/ext/mhash/mhash.c:1.48.2.3.2.5.2.2
php-src/ext/mhash/mhash.c:1.48.2.3.2.5.2.3
--- php-src/ext/mhash/mhash.c:1.48.2.3.2.5.2.2 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mhash/mhash.c Mon Mar 10 22:12:34 2008
@@ -16,7 +16,7 @@
| Nikos Mavroyanopoulos <[EMAIL PROTECTED]> (HMAC, KEYGEN) |
+----------------------------------------------------------------------+
*/
-/* $Id: mhash.c,v 1.48.2.3.2.5.2.2 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: mhash.c,v 1.48.2.3.2.5.2.3 2008/03/10 22:12:34 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -95,8 +95,8 @@
Gets the number of available hashes */
PHP_FUNCTION(mhash_count)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_LONG(mhash_count());
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.8.2.2&r2=1.79.2.4.2.8.2.3&diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79.2.4.2.8.2.2
php-src/ext/ming/ming.c:1.79.2.4.2.8.2.3
--- php-src/ext/ming/ming.c:1.79.2.4.2.8.2.2 Mon Dec 31 07:17:10 2007
+++ php-src/ext/ming/ming.c Mon Mar 10 22:12:35 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ming.c,v 1.79.2.4.2.8.2.2 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: ming.c,v 1.79.2.4.2.8.2.3 2008/03/10 22:12:35 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -443,8 +443,8 @@
Returns the width of this bitmap */
PHP_METHOD(swfbitmap, getWidth)
{
- if(ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_DOUBLE(SWFBitmap_getWidth(getBitmap(getThis() TSRMLS_CC)));
}
@@ -454,8 +454,8 @@
Returns the height of this bitmap */
PHP_METHOD(swfbitmap, getHeight)
{
- if(ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_DOUBLE(SWFBitmap_getHeight(getBitmap(getThis() TSRMLS_CC)));
}
@@ -1056,9 +1056,9 @@
{
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
SWFDisplayItem_remove(item);
}
/* }}} */
@@ -1086,9 +1086,9 @@
{
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
SWFDisplayItem_endMask(item);
}
/* }}} */
@@ -1100,9 +1100,9 @@
float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
ret = SWFDisplayItem_get_x(item);
RETURN_DOUBLE(ret);
}
@@ -1115,9 +1115,9 @@
float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
ret = SWFDisplayItem_get_y(item);
RETURN_DOUBLE(ret);
}
@@ -1130,9 +1130,9 @@
float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
ret = SWFDisplayItem_get_xScale(item);
RETURN_DOUBLE(ret);
}
@@ -1145,9 +1145,9 @@
float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
ret = SWFDisplayItem_get_yScale(item);
RETURN_DOUBLE(ret);
}
@@ -1160,9 +1160,9 @@
float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
ret = SWFDisplayItem_get_xSkew(item);
RETURN_DOUBLE(ret);
}
@@ -1175,9 +1175,9 @@
float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
ret = SWFDisplayItem_get_ySkew(item);
RETURN_DOUBLE(ret);
}
@@ -1190,9 +1190,9 @@
float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
ret = SWFDisplayItem_get_rot(item);
RETURN_DOUBLE(ret);
}
@@ -1547,8 +1547,8 @@
Returns the ascent of the font, or 0 if not available */
PHP_METHOD(swffont, getAscent)
{
- if(ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_DOUBLE(SWFFont_getAscent(getFont(getThis() TSRMLS_CC)));
}
@@ -1558,8 +1558,8 @@
Returns the descent of the font, or 0 if not available */
PHP_METHOD(swffont, getDescent)
{
- if(ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_DOUBLE(SWFFont_getDescent(getFont(getThis() TSRMLS_CC)));
}
@@ -1569,8 +1569,8 @@
Returns the leading of the font, or 0 if not available */
PHP_METHOD(swffont, getLeading)
{
- if(ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_DOUBLE(SWFFont_getLeading(getFont(getThis() TSRMLS_CC)));
}
@@ -1879,9 +1879,9 @@
{
SWFSoundInstance inst = getSoundInstance(getThis() TSRMLS_CC);
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
SWFSoundInstance_setNoMultiple(inst);
}
/* }}} */
@@ -2031,9 +2031,9 @@
/* {{{ getNumFrames */
PHP_METHOD(swfvideostream, getnumframes)
{
- if(ZEND_NUM_ARGS() != 0)
- WRONG_PARAM_COUNT;
-
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
RETURN_LONG(SWFVideoStream_getNumFrames(getVideoStream(getThis()
TSRMLS_CC)));
}
/* }}} */
@@ -3748,8 +3748,8 @@
Returns the ascent of the current font at its current size, or 0 if not
available */
PHP_METHOD(swftext, getAscent)
{
- if(ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_DOUBLE(SWFText_getAscent(getText(getThis() TSRMLS_CC)));
}
@@ -3759,8 +3759,8 @@
Returns the descent of the current font at its current size, or 0 if not
available */
PHP_METHOD(swftext, getDescent)
{
- if(ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_DOUBLE(SWFText_getDescent(getText(getThis() TSRMLS_CC)));
}
@@ -3770,8 +3770,8 @@
Returns the leading of the current font at its current size, or 0 if not
available */
PHP_METHOD(swftext, getLeading)
{
- if(ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_DOUBLE(SWFText_getLeading(getText(getThis() TSRMLS_CC)));
}
http://cvs.php.net/viewvc.cgi/php-src/ext/msql/php_msql.c?r1=1.60.2.4.2.2.2.2&r2=1.60.2.4.2.2.2.3&diff_format=u
Index: php-src/ext/msql/php_msql.c
diff -u php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.2
php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.3
--- php-src/ext/msql/php_msql.c:1.60.2.4.2.2.2.2 Mon Dec 31 07:17:10 2007
+++ php-src/ext/msql/php_msql.c Mon Mar 10 22:12:35 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_msql.c,v 1.60.2.4.2.2.2.2 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: php_msql.c,v 1.60.2.4.2.2.2.3 2008/03/10 22:12:35 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -747,8 +747,8 @@
Returns the text of the error message from previous mSQL operation */
PHP_FUNCTION(msql_error)
{
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING(msqlErrMsg,1);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.3&r2=1.189.2.4.2.7.2.4&diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.3
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.4
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.3 Mon Dec 31 07:17:11 2007
+++ php-src/ext/odbc/php_odbc.c Mon Mar 10 22:12:35 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.3 2007/12/31 07:17:11 sebastian Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.4 2008/03/10 22:12:35 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -782,8 +782,8 @@
int i;
int nument;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
nument = zend_hash_next_free_element(&EG(regular_list));
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.6&r2=1.98.2.5.2.41.2.7&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.6
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.7
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.6 Tue Jan 15 15:12:47 2008
+++ php-src/ext/openssl/openssl.c Mon Mar 10 22:12:35 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.6 2008/01/15 15:12:47 rrichards Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.7 2008/03/10 22:12:35 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3648,8 +3648,8 @@
char buf[512];
unsigned long val;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
val = ERR_get_error();
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.7&r2=1.82.2.31.2.17.2.8&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.7
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.8
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.7 Mon Mar 3 21:12:16 2008
+++ php-src/ext/pdo/pdo_dbh.c Mon Mar 10 22:12:35 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.7 2008/03/03 21:12:16 iliaa Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.8 2008/03/10 22:12:35 felipe Exp $ */
/* The PDO Database Handle Class */
@@ -972,8 +972,8 @@
{
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (ZEND_NUM_ARGS()) {
- RETURN_FALSE;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
PDO_CONSTRUCT_CHECK;
@@ -991,8 +991,8 @@
{
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
PDO_CONSTRUCT_CHECK;
@@ -1134,8 +1134,8 @@
HashPosition pos;
pdo_driver_t **pdriver;
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.14&r2=1.118.2.38.2.24.2.15&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.14
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.15
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.14 Mon Mar 3 19:00:45 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Mar 10 22:12:35 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.14 2008/03/03 19:00:45 johannes Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.15 2008/03/10 22:12:35 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -1729,8 +1729,8 @@
{
PHP_STMT_GET_OBJ;
- if (ZEND_NUM_ARGS()) {
- RETURN_FALSE;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING(stmt->error_code, 1);
@@ -1743,8 +1743,8 @@
{
PHP_STMT_GET_OBJ;
- if (ZEND_NUM_ARGS()) {
- RETURN_FALSE;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
@@ -1844,8 +1844,8 @@
static PHP_METHOD(PDOStatement, columnCount)
{
PHP_STMT_GET_OBJ;
- if (ZEND_NUM_ARGS()) {
- RETURN_FALSE;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_LONG(stmt->column_count);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.16.2.2&r2=1.70.2.3.2.16.2.3&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.16.2.2
php-src/ext/posix/posix.c:1.70.2.3.2.16.2.3
--- php-src/ext/posix/posix.c:1.70.2.3.2.16.2.2 Mon Dec 31 07:17:12 2007
+++ php-src/ext/posix/posix.c Mon Mar 10 22:12:35 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.70.2.3.2.16.2.2 2007/12/31 07:17:12 sebastian Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.16.2.3 2008/03/10 22:12:35 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.16.2.2
$");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.16.2.3
$");
php_info_print_table_end();
}
/* }}} */
@@ -209,7 +209,7 @@
ZEND_GET_MODULE(posix)
#endif
-#define PHP_POSIX_NO_ARGS if (ZEND_NUM_ARGS()) WRONG_PARAM_COUNT;
+#define PHP_POSIX_NO_ARGS if (zend_parse_parameters_none() == FAILURE)
return;
#define PHP_POSIX_RETURN_LONG_FUNC(func_name) \
PHP_POSIX_NO_ARGS \
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.4&r2=1.417.2.8.2.40.2.5&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.4
php-src/ext/session/session.c:1.417.2.8.2.40.2.5
--- php-src/ext/session/session.c:1.417.2.8.2.40.2.4 Fri Mar 7 23:20:32 2008
+++ php-src/ext/session/session.c Mon Mar 10 22:12:35 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.417.2.8.2.40.2.4 2008/03/07 23:20:32 gwynne Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.40.2.5 2008/03/10 22:12:35 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1411,8 +1411,8 @@
Return the session cookie parameters */
PHP_FUNCTION(session_get_cookie_params)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
@@ -1763,8 +1763,8 @@
int len;
char *enc;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
enc = php_session_encode(&len TSRMLS_CC);
@@ -1812,8 +1812,8 @@
Destroy the current session and all data associated with it */
PHP_FUNCTION(session_destroy)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (php_session_destroy(TSRMLS_C) == SUCCESS) {
http://cvs.php.net/viewvc.cgi/php-src/ext/skeleton/create_stubs?r1=1.27&r2=1.27.8.1&diff_format=u
Index: php-src/ext/skeleton/create_stubs
diff -u php-src/ext/skeleton/create_stubs:1.27
php-src/ext/skeleton/create_stubs:1.27.8.1
--- php-src/ext/skeleton/create_stubs:1.27 Sun Jun 29 16:07:18 2003
+++ php-src/ext/skeleton/create_stubs Mon Mar 10 22:12:35 2008
@@ -67,7 +67,7 @@
xmlhead = "<?xml version='1.0' encoding='iso-8859-1'?>\n" \
- "<!-- $Revision: 1.27 $ -->\n" \
+ "<!-- $Revision: 1.27.8.1 $ -->\n" \
" <reference id=\"ref." extname "\">\n" \
" <title> functions</title>\n" \
" <titleabbrev></titleabbrev>\n\n" \
@@ -197,7 +197,7 @@
ints = ints "\tint argc = ZEND_NUM_ARGS();\n"
fetchargs = fetchargs "argc TSRMLS_CC, " specs[i]
} else {
- fetchargs = fetchargs "\tif (ZEND_NUM_ARGS() != 0)
{\n\t\tWRONG_PARAM_COUNT;\n\t}"
+ fetchargs = fetchargs "\tif
(zend_parse_parameters_none() == FAILURE) {\n\t\treturn;\n\t}"
xmlparams = xmlparams " <void/>\n"
}
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.5.2.2&r2=1.106.2.2.2.5.2.3&diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.2
php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.3
--- php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.2 Mon Dec 31 07:17:13 2007
+++ php-src/ext/snmp/snmp.c Mon Mar 10 22:12:35 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snmp.c,v 1.106.2.2.2.5.2.2 2007/12/31 07:17:13 sebastian Exp $ */
+/* $Id: snmp.c,v 1.106.2.2.2.5.2.3 2008/03/10 22:12:35 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -693,8 +693,8 @@
Return the current status of quick_print */
PHP_FUNCTION(snmp_get_quick_print)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
#ifdef HAVE_NET_SNMP
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.13&r2=1.156.2.28.2.30.2.14&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.13
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.14
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.13 Tue Mar 4 12:47:18 2008
+++ php-src/ext/soap/soap.c Mon Mar 10 22:12:35 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.30.2.13 2008/03/04 12:47:18 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.14 2008/03/10 22:12:35 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -821,8 +821,8 @@
zend_fcall_info fci;
zval fname;
- if (ZEND_NUM_ARGS() > 0) {
- ZEND_WRONG_PARAM_COUNT();
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
faultcode = zend_read_property(soap_fault_class_entry, this_ptr,
"faultcode", sizeof("faultcode")-1, 1 TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9.2.5&r2=1.166.2.13.2.9.2.6&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.5
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.6
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.5 Sun Mar 9 21:30:28 2008
+++ php-src/ext/sqlite/sqlite.c Mon Mar 10 22:12:36 2008
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.166.2.13.2.9.2.5 2008/03/09 21:30:28 scottmac Exp $
+ $Id: sqlite.c,v 1.166.2.13.2.9.2.6 2008/03/10 22:12:36 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1139,7 +1139,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.5 2008/03/09
21:30:28 scottmac Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.6 2008/03/10
22:12:36 felipe Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -2426,8 +2426,8 @@
Returns the version of the linked SQLite library. */
PHP_FUNCTION(sqlite_libversion)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING((char*)sqlite_libversion(), 1);
}
@@ -2437,8 +2437,8 @@
Returns the encoding (iso8859 or UTF-8) of the linked SQLite library. */
PHP_FUNCTION(sqlite_libencoding)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING((char*)sqlite_libencoding(), 1);
}
@@ -2453,8 +2453,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
DB_FROM_OBJECT(db, object);
} else {
@@ -2477,8 +2477,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
DB_FROM_OBJECT(db, object);
} else {
@@ -2514,8 +2514,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RES_FROM_OBJECT(res, object);
} else {
@@ -2543,8 +2543,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RES_FROM_OBJECT(res, object);
} else {
@@ -2567,8 +2567,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RES_FROM_OBJECT(res, object);
} else {
@@ -2596,8 +2596,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RES_FROM_OBJECT(res, object);
} else {
@@ -2686,8 +2686,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RES_FROM_OBJECT(res, object);
} else {
@@ -2721,8 +2721,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RES_FROM_OBJECT(res, object);
} else {
@@ -2756,8 +2756,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RES_FROM_OBJECT(res, object);
} else {
@@ -2780,8 +2780,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RES_FROM_OBJECT(res, object);
} else {
@@ -2849,8 +2849,8 @@
zval *object = getThis();
if (object) {
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
DB_FROM_OBJECT(db, object);
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.20&r2=1.725.2.31.2.64.2.21&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.20
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.21
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.20 Sat Feb 23
17:06:21 2008
+++ php-src/ext/standard/basic_functions.c Mon Mar 10 22:12:36 2008
@@ -1,3 +1,4 @@
+
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
@@ -17,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.20 2008/02/23 17:06:21 helly Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.21 2008/03/10 22:12:36 felipe
Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4866,8 +4867,8 @@
Get the name of the owner of the current PHP script */
PHP_FUNCTION(get_current_user)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING(php_get_current_user(), 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12.2.5&r2=1.147.2.3.2.12.2.6&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.5
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.6
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.5 Wed Mar 5 12:10:02 2008
+++ php-src/ext/standard/dir.c Mon Mar 10 22:12:36 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.5 2008/03/05 12:10:02 tony2001 Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.6 2008/03/10 22:12:36 felipe Exp $ */
/* {{{ includes/startup/misc */
@@ -333,8 +333,8 @@
char path[MAXPATHLEN];
char *ret=NULL;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
#if HAVE_GETCWD
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.8.2.14.2.5&r2=1.136.2.8.2.14.2.6&diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.5
php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.6
--- php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.5 Mon Dec 31 07:17:14 2007
+++ php-src/ext/standard/filestat.c Mon Mar 10 22:12:36 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.136.2.8.2.14.2.5 2007/12/31 07:17:14 sebastian Exp $ */
+/* $Id: filestat.c,v 1.136.2.8.2.14.2.6 2008/03/10 22:12:36 felipe Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -730,8 +730,8 @@
Clear file stat cache */
PHP_FUNCTION(clearstatcache)
{
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
php_clear_stat_cache(TSRMLS_C);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.84.2.1.2.7.2.2&r2=1.84.2.1.2.7.2.3&diff_format=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.84.2.1.2.7.2.2
php-src/ext/standard/head.c:1.84.2.1.2.7.2.3
--- php-src/ext/standard/head.c:1.84.2.1.2.7.2.2 Fri Feb 22 05:13:20 2008
+++ php-src/ext/standard/head.c Mon Mar 10 22:12:36 2008
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: head.c,v 1.84.2.1.2.7.2.2 2008/02/22 05:13:20 rasmus Exp $ */
+/* $Id: head.c,v 1.84.2.1.2.7.2.3 2008/03/10 22:12:36 felipe Exp $ */
#include <stdio.h>
#include "php.h"
@@ -246,8 +246,8 @@
Return list of headers to be sent / already sent */
PHP_FUNCTION(headers_list)
{
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (!&SG(sapi_headers).headers) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.14.2.3&r2=1.249.2.10.2.14.2.4&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.14.2.3
php-src/ext/standard/info.c:1.249.2.10.2.14.2.4
--- php-src/ext/standard/info.c:1.249.2.10.2.14.2.3 Sun Mar 2 15:35:05 2008
+++ php-src/ext/standard/info.c Mon Mar 10 22:12:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.249.2.10.2.14.2.3 2008/03/02 15:35:05 iliaa Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.14.2.4 2008/03/10 22:12:36 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1082,8 +1082,8 @@
PHP_FUNCTION(php_logo_guid)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING(php_logo_guid(), 0);
@@ -1095,8 +1095,8 @@
PHP_FUNCTION(php_real_logo_guid)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRINGL(PHP_LOGO_GUID, sizeof(PHP_LOGO_GUID)-1, 1);
@@ -1107,8 +1107,8 @@
Return the special ID used to request the PHP logo in phpinfo screens*/
PHP_FUNCTION(php_egg_logo_guid)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
@@ -1119,8 +1119,8 @@
Return the special ID used to request the Zend logo in phpinfo screens*/
PHP_FUNCTION(zend_logo_guid)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRINGL(ZEND_LOGO_GUID, sizeof(ZEND_LOGO_GUID)-1, 1);
@@ -1131,8 +1131,8 @@
Return the current SAPI module name */
PHP_FUNCTION(php_sapi_name)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (sapi_module.name) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/rand.c?r1=1.70.2.1.2.2.2.1&r2=1.70.2.1.2.2.2.2&diff_format=u
Index: php-src/ext/standard/rand.c
diff -u php-src/ext/standard/rand.c:1.70.2.1.2.2.2.1
php-src/ext/standard/rand.c:1.70.2.1.2.2.2.2
--- php-src/ext/standard/rand.c:1.70.2.1.2.2.2.1 Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/rand.c Mon Mar 10 22:12:36 2008
@@ -23,7 +23,7 @@
| Shawn Cokus <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: rand.c,v 1.70.2.1.2.2.2.1 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: rand.c,v 1.70.2.1.2.2.2.2 2008/03/10 22:12:36 felipe Exp $ */
#include <stdlib.h>
@@ -351,8 +351,8 @@
Returns the maximum value a random number can have */
PHP_FUNCTION(getrandmax)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_LONG(PHP_RAND_MAX);
@@ -363,8 +363,8 @@
Returns the maximum value a random number from Mersenne Twister can have */
PHP_FUNCTION(mt_getrandmax)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
/*
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.9&r2=1.58.2.6.2.15.2.10&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.9
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.10
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.9 Sun Feb 3
16:14:16 2008
+++ php-src/ext/standard/streamsfuncs.c Mon Mar 10 22:12:36 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.9 2008/02/03 16:14:16 iliaa Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.10 2008/03/10 22:12:36 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -520,8 +520,8 @@
int stream_xport_len;
ulong num_key;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if ((stream_xport_hash = php_stream_xport_get_hash())) {
@@ -548,8 +548,8 @@
int key_flags, stream_protocol_len = 0;
ulong num_key;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if ((url_stream_wrappers_hash =
php_stream_get_url_stream_wrappers_hash())) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.18&r2=1.445.2.14.2.69.2.19&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.18
php-src/ext/standard/string.c:1.445.2.14.2.69.2.19
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.18 Sat Feb 23 17:06:21 2008
+++ php-src/ext/standard/string.c Mon Mar 10 22:12:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.18 2008/02/23 17:06:21 helly Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.19 2008/03/10 22:12:36 felipe Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4683,8 +4683,8 @@
int len, i;
/* We don't need no stinkin' parameters... */
- if (ZEND_NUM_ARGS() > 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
MAKE_STD_ZVAL(grouping);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/syslog.c?r1=1.49.2.3.2.2.2.2&r2=1.49.2.3.2.2.2.3&diff_format=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.2
php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.3
--- php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.2 Wed Feb 20 15:27:30 2008
+++ php-src/ext/standard/syslog.c Mon Mar 10 22:12:36 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: syslog.c,v 1.49.2.3.2.2.2.2 2008/02/20 15:27:30 iliaa Exp $ */
+/* $Id: syslog.c,v 1.49.2.3.2.2.2.3 2008/03/10 22:12:36 felipe Exp $ */
#include "php.h"
@@ -203,8 +203,8 @@
Initializes all syslog-related variables */
PHP_FUNCTION(define_syslog_variables)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if (!BG(syslog_started)) {
@@ -243,8 +243,8 @@
Close connection to system logger */
PHP_FUNCTION(closelog)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
closelog();
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4.2.9.2.3&r2=1.31.2.4.2.9.2.4&diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.3
php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.4
--- php-src/ext/standard/user_filters.c:1.31.2.4.2.9.2.3 Mon Dec 31
07:17:15 2007
+++ php-src/ext/standard/user_filters.c Mon Mar 10 22:12:36 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: user_filters.c,v 1.31.2.4.2.9.2.3 2007/12/31 07:17:15 sebastian Exp $
*/
+/* $Id: user_filters.c,v 1.31.2.4.2.9.2.4 2008/03/10 22:12:36 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -534,8 +534,8 @@
HashTable *filters_hash;
ulong num_key;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.24.2.5&r2=1.66.2.8.2.24.2.6&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.5
php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.6
--- php-src/ext/tidy/tidy.c:1.66.2.8.2.24.2.5 Sun Jan 27 15:04:41 2008
+++ php-src/ext/tidy/tidy.c Mon Mar 10 22:12:36 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tidy.c,v 1.66.2.8.2.24.2.5 2008/01/27 15:04:41 helly Exp $ */
+/* $Id: tidy.c,v 1.66.2.8.2.24.2.6 2008/03/10 22:12:36 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -50,8 +50,8 @@
PHPTidyObj *obj; \
TIDY_SET_CONTEXT; \
if (object) { \
- if (ZEND_NUM_ARGS()) { \
- WRONG_PARAM_COUNT; \
+ if (zend_parse_parameters_none() == FAILURE) { \
+ return; \
} \
} else { \
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
NULL, "O", &object, tidy_ce_doc) == FAILURE) { \
@@ -63,8 +63,8 @@
#define TIDY_FETCH_ONLY_OBJECT \
PHPTidyObj *obj; \
TIDY_SET_CONTEXT; \
- if (ZEND_NUM_ARGS()) { \
- WRONG_PARAM_COUNT; \
+ if (zend_parse_parameters_none() == FAILURE) { \
+ return; \
} \
obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC);
\
@@ -998,7 +998,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.24.2.5 2008/01/27 15:04:41
helly Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.24.2.6 2008/03/10 22:12:36
felipe Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1204,8 +1204,8 @@
Get release date (version) for Tidy library */
static PHP_FUNCTION(tidy_get_release)
{
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_STRING((char *)tidyReleaseDate(), 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.6.2.3&r2=1.39.2.5.2.6.2.4&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.3
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.4
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.3 Mon Dec 31
07:17:16 2007
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Mon Mar 10 22:12:36 2008
@@ -51,7 +51,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.3 2007/12/31 07:17:16 sebastian Exp
$ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.4 2008/03/10 22:12:36 felipe Exp $ */
/**********************************************************************
* BUGS: *
@@ -794,8 +794,8 @@
Creates an xmlrpc server */
PHP_FUNCTION(xmlrpc_server_create)
{
- if(ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
if(return_value_used) {
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.15.2.3&r2=1.20.2.12.2.15.2.4&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.3
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.4
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.3 Mon Dec 31
07:17:16 2007
+++ php-src/ext/xmlwriter/php_xmlwriter.c Mon Mar 10 22:12:36 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.3 2007/12/31 07:17:16 sebastian Exp
$ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.4 2008/03/10 22:12:36 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -464,8 +464,8 @@
if (this) {
XMLWRITER_FROM_OBJECT(intern, this);
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
} else
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
