felipe Thu Feb 28 14:16:25 2008 UTC
Modified files:
/php-src/ext/com_dotnet com_com.c
/php-src/ext/curl multi.c
/php-src/ext/dom php_dom.h
/php-src/ext/fdf fdf.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/mysql php_mysql.c
/php-src/ext/odbc php_odbc.c
/php-src/ext/openssl openssl.c
/php-src/ext/pcre php_pcre.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/spl spl_dllist.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/standard basic_functions.c dir.c file.c head.c info.c
rand.c streamsfuncs.c string.c syslog.c
user_filters.c
/php-src/ext/unicode collator.c locale.c unicode.c
unicode_iterators.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-src/sapi/apache_hooks php_apache.c
Log:
New macro for check void parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_com.c?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/com_dotnet/com_com.c
diff -u php-src/ext/com_dotnet/com_com.c:1.25
php-src/ext/com_dotnet/com_com.c:1.26
--- php-src/ext/com_dotnet/com_com.c:1.25 Mon Dec 31 07:12:07 2007
+++ php-src/ext/com_dotnet/com_com.c Thu Feb 28 14:16:12 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_com.c,v 1.25 2007/12/31 07:12:07 sebastian Exp $ */
+/* $Id: com_com.c,v 1.26 2008/02/28 14:16:12 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.32&r2=1.33&diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.32 php-src/ext/curl/multi.c:1.33
--- php-src/ext/curl/multi.c:1.32 Mon Dec 31 07:12:08 2007
+++ php-src/ext/curl/multi.c Thu Feb 28 14:16:12 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: multi.c,v 1.32 2007/12/31 07:12:08 sebastian Exp $ */
+/* $Id: multi.c,v 1.33 2008/02/28 14:16:12 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/dom/php_dom.h?r1=1.36&r2=1.37&diff_format=u
Index: php-src/ext/dom/php_dom.h
diff -u php-src/ext/dom/php_dom.h:1.36 php-src/ext/dom/php_dom.h:1.37
--- php-src/ext/dom/php_dom.h:1.36 Mon Dec 31 07:12:09 2007
+++ php-src/ext/dom/php_dom.h Thu Feb 28 14:16:12 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.h,v 1.36 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: php_dom.h,v 1.37 2008/02/28 14:16:12 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.104&r2=1.105&diff_format=u
Index: php-src/ext/fdf/fdf.c
diff -u php-src/ext/fdf/fdf.c:1.104 php-src/ext/fdf/fdf.c:1.105
--- php-src/ext/fdf/fdf.c:1.104 Mon Dec 31 07:12:09 2007
+++ php-src/ext/fdf/fdf.c Thu Feb 28 14:16:12 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fdf.c,v 1.104 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: fdf.c,v 1.105 2008/02/28 14:16:12 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/gd/gd.c?r1=1.383&r2=1.384&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.383 php-src/ext/gd/gd.c:1.384
--- php-src/ext/gd/gd.c:1.383 Mon Dec 31 07:12:09 2007
+++ php-src/ext/gd/gd.c Thu Feb 28 14:16:12 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.383 2007/12/31 07:12:09 sebastian Exp $ */
+/* $Id: gd.c,v 1.384 2008/02/28 14:16:12 felipe Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1350,9 +1350,8 @@
*/
PHP_FUNCTION(gd_info)
{
- if (ZEND_NUM_ARGS() != 0) {
- ZEND_WRONG_PARAM_COUNT();
- RETURN_FALSE;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
array_init(return_value);
@@ -2159,8 +2158,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.243&r2=1.244&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.243 php-src/ext/imap/php_imap.c:1.244
--- php-src/ext/imap/php_imap.c:1.243 Thu Jan 31 18:48:00 2008
+++ php-src/ext/imap/php_imap.c Thu Feb 28 14:16:12 2008
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.243 2008/01/31 18:48:00 nlopess Exp $ */
+/* $Id: php_imap.c,v 1.244 2008/02/28 14:16:12 felipe Exp $ */
#define IMAP41
@@ -3657,8 +3657,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) {
@@ -3684,8 +3684,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) {
@@ -3711,8 +3711,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.237&r2=1.238&diff_format=u
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.237
php-src/ext/interbase/interbase.c:1.238
--- php-src/ext/interbase/interbase.c:1.237 Mon Dec 31 07:12:10 2007
+++ php-src/ext/interbase/interbase.c Thu Feb 28 14:16:12 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interbase.c,v 1.237 2007/12/31 07:12:10 sebastian Exp $ */
+/* $Id: interbase.c,v 1.238 2008/02/28 14:16:12 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.60&r2=1.61&diff_format=u
Index: php-src/ext/mhash/mhash.c
diff -u php-src/ext/mhash/mhash.c:1.60 php-src/ext/mhash/mhash.c:1.61
--- php-src/ext/mhash/mhash.c:1.60 Mon Dec 31 07:12:11 2007
+++ php-src/ext/mhash/mhash.c Thu Feb 28 14:16:12 2008
@@ -16,7 +16,7 @@
| Nikos Mavroyanopoulos <[EMAIL PROTECTED]> (HMAC, KEYGEN) |
+----------------------------------------------------------------------+
*/
-/* $Id: mhash.c,v 1.60 2007/12/31 07:12:11 sebastian Exp $ */
+/* $Id: mhash.c,v 1.61 2008/02/28 14:16:12 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -63,7 +63,7 @@
ZEND_GET_MODULE(mhash)
#endif
-#define NO_ARGS() (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
""))
+#define NO_ARGS() (SUCCESS == zend_parse_parameters_none())
#ifndef HAVE_MHASH_GET_HASH_NAME_STATIC_PROTO
extern const char *mhash_get_hash_name_static(hashid hash);
http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.95&r2=1.96&diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.95 php-src/ext/ming/ming.c:1.96
--- php-src/ext/ming/ming.c:1.95 Mon Dec 31 07:12:11 2007
+++ php-src/ext/ming/ming.c Thu Feb 28 14:16:13 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ming.c,v 1.95 2007/12/31 07:12:11 sebastian Exp $ */
+/* $Id: ming.c,v 1.96 2008/02/28 14:16:13 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);
}
/* }}} */
@@ -2030,9 +2030,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)));
}
/* }}} */
@@ -3746,8 +3746,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)));
}
@@ -3757,8 +3757,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)));
}
@@ -3768,8 +3768,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/mysql/php_mysql.c?r1=1.252&r2=1.253&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.252 php-src/ext/mysql/php_mysql.c:1.253
--- php-src/ext/mysql/php_mysql.c:1.252 Sat Feb 23 17:03:53 2008
+++ php-src/ext/mysql/php_mysql.c Thu Feb 28 14:16:13 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.252 2008/02/23 17:03:53 helly Exp $ */
+/* $Id: php_mysql.c,v 1.253 2008/02/28 14:16:13 felipe Exp $ */
/* TODO:
*
@@ -1032,8 +1032,8 @@
Returns a string that represents the client library version */
PHP_FUNCTION(mysql_get_client_info)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_UTF8_STRING((char *)mysql_get_client_info(), ZSTR_DUPLICATE);
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.206&r2=1.207&diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.206 php-src/ext/odbc/php_odbc.c:1.207
--- php-src/ext/odbc/php_odbc.c:1.206 Mon Dec 31 07:12:12 2007
+++ php-src/ext/odbc/php_odbc.c Thu Feb 28 14:16:13 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.206 2007/12/31 07:12:12 sebastian Exp $ */
+/* $Id: php_odbc.c,v 1.207 2008/02/28 14:16:13 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.155&r2=1.156&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.155 php-src/ext/openssl/openssl.c:1.156
--- php-src/ext/openssl/openssl.c:1.155 Tue Jan 15 15:12:12 2008
+++ php-src/ext/openssl/openssl.c Thu Feb 28 14:16:13 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.155 2008/01/15 15:12:12 rrichards Exp $ */
+/* $Id: openssl.c,v 1.156 2008/02/28 14:16:13 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3686,8 +3686,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/pcre/php_pcre.c?r1=1.230&r2=1.231&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.230 php-src/ext/pcre/php_pcre.c:1.231
--- php-src/ext/pcre/php_pcre.c:1.230 Wed Feb 20 22:15:53 2008
+++ php-src/ext/pcre/php_pcre.c Thu Feb 28 14:16:13 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.230 2008/02/20 22:15:53 felipe Exp $ */
+/* $Id: php_pcre.c,v 1.231 2008/02/28 14:16:13 felipe Exp $ */
/* TODO
* php_pcre_replace_impl():
@@ -2023,7 +2023,7 @@
Returns the error code of the last regexp execution. */
static PHP_FUNCTION(preg_last_error)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.479&r2=1.480&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.479 php-src/ext/session/session.c:1.480
--- php-src/ext/session/session.c:1.479 Mon Dec 31 07:12:14 2007
+++ php-src/ext/session/session.c Thu Feb 28 14:16:13 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.479 2007/12/31 07:12:14 sebastian Exp $ */
+/* $Id: session.c,v 1.480 2008/02/28 14:16:13 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1402,8 +1402,8 @@
Return the session cookie parameters */
static 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);
@@ -1690,8 +1690,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);
@@ -1738,8 +1738,8 @@
Destroy the current session and all data associated with it */
static PHP_FUNCTION(session_destroy)
{
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
RETURN_BOOL(php_session_destroy(TSRMLS_C) == SUCCESS);
http://cvs.php.net/viewvc.cgi/php-src/ext/skeleton/create_stubs?r1=1.27&r2=1.28&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.28
--- php-src/ext/skeleton/create_stubs:1.27 Sun Jun 29 16:07:18 2003
+++ php-src/ext/skeleton/create_stubs Thu Feb 28 14:16:13 2008
@@ -67,7 +67,7 @@
xmlhead = "<?xml version='1.0' encoding='iso-8859-1'?>\n" \
- "<!-- $Revision: 1.27 $ -->\n" \
+ "<!-- $Revision: 1.28 $ -->\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.115&r2=1.116&diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.115 php-src/ext/snmp/snmp.c:1.116
--- php-src/ext/snmp/snmp.c:1.115 Mon Dec 31 07:12:14 2007
+++ php-src/ext/snmp/snmp.c Thu Feb 28 14:16:13 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snmp.c,v 1.115 2007/12/31 07:12:14 sebastian Exp $ */
+/* $Id: snmp.c,v 1.116 2008/02/28 14:16:13 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.242&r2=1.243&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.242 php-src/ext/soap/soap.c:1.243
--- php-src/ext/soap/soap.c:1.242 Fri Feb 15 06:51:41 2008
+++ php-src/ext/soap/soap.c Thu Feb 28 14:16:13 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.242 2008/02/15 06:51:41 dmitry Exp $ */
+/* $Id: soap.c,v 1.243 2008/02/28 14:16:13 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -111,8 +111,8 @@
#define HTTP_RAW_POST_DATA "HTTP_RAW_POST_DATA"
#define ZERO_PARAM() \
- if (ZEND_NUM_ARGS() != 0) \
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) \
+ return;
static zend_class_entry* soap_client_class_entry;
static zend_class_entry* soap_server_class_entry;
@@ -1130,8 +1130,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/spl/spl_dllist.c?r1=1.10&r2=1.11&diff_format=u
Index: php-src/ext/spl/spl_dllist.c
diff -u php-src/ext/spl/spl_dllist.c:1.10 php-src/ext/spl/spl_dllist.c:1.11
--- php-src/ext/spl/spl_dllist.c:1.10 Mon Feb 18 23:54:45 2008
+++ php-src/ext/spl/spl_dllist.c Thu Feb 28 14:16:14 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_dllist.c,v 1.10 2008/02/18 23:54:45 colder Exp $ */
+/* $Id: spl_dllist.c,v 1.11 2008/02/28 14:16:14 felipe Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -565,7 +565,7 @@
zval *value;
spl_dllist_object *intern;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -588,7 +588,7 @@
zval *value;
spl_dllist_object *intern;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -611,7 +611,7 @@
zval *value;
spl_dllist_object *intern;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -634,7 +634,7 @@
zval *value;
spl_dllist_object *intern;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -656,7 +656,7 @@
{
long count;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -671,7 +671,7 @@
{
long count;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -711,7 +711,7 @@
{
spl_dllist_object *intern;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.205&r2=1.206&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.205 php-src/ext/sqlite/sqlite.c:1.206
--- php-src/ext/sqlite/sqlite.c:1.205 Mon Dec 31 07:12:15 2007
+++ php-src/ext/sqlite/sqlite.c Thu Feb 28 14:16:14 2008
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.205 2007/12/31 07:12:15 sebastian Exp $
+ $Id: sqlite.c,v 1.206 2008/02/28 14:16:14 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1220,7 +1220,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.205 2007/12/31 07:12:15 sebastian
Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.206 2008/02/28 14:16:14 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();
@@ -2615,8 +2615,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_ASCII_STRING((char*)sqlite_libversion(), ZSTR_DUPLICATE);
}
@@ -2626,8 +2626,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_ASCII_STRING((char*)sqlite_libencoding(), ZSTR_DUPLICATE);
}
@@ -2642,8 +2642,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 {
@@ -2666,8 +2666,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 {
@@ -2703,8 +2703,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 {
@@ -2732,8 +2732,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 {
@@ -2785,8 +2785,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 {
@@ -2874,8 +2874,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 {
@@ -2909,8 +2909,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 {
@@ -2944,8 +2944,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 {
@@ -2968,8 +2968,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 {
@@ -3036,8 +3036,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.889&r2=1.890&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.889
php-src/ext/standard/basic_functions.c:1.890
--- php-src/ext/standard/basic_functions.c:1.889 Sun Feb 3 14:44:29 2008
+++ php-src/ext/standard/basic_functions.c Thu Feb 28 14:16:14 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.889 2008/02/03 14:44:29 helly Exp $ */
+/* $Id: basic_functions.c,v 1.890 2008/02/28 14:16:14 felipe Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4828,8 +4828,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_RT_STRING(php_get_current_user(), ZSTR_DUPLICATE);
@@ -5055,7 +5055,7 @@
Get the last occurred error as associative array. Returns NULL if there
hasn't been an error yet. */
PHP_FUNCTION(error_get_last)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -5804,7 +5804,7 @@
{
char *str;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -5822,7 +5822,7 @@
Restore the value of the include_path configuration option */
PHP_FUNCTION(restore_include_path)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
zend_restore_ini_entry("include_path", sizeof("include_path"),
PHP_INI_STAGE_RUNTIME);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.172&r2=1.173&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.172 php-src/ext/standard/dir.c:1.173
--- php-src/ext/standard/dir.c:1.172 Mon Dec 31 07:12:15 2007
+++ php-src/ext/standard/dir.c Thu Feb 28 14:16:14 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.172 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: dir.c,v 1.173 2008/02/28 14:16:14 felipe Exp $ */
/* {{{ includes/startup/misc */
@@ -355,8 +355,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/file.c?r1=1.513&r2=1.514&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.513 php-src/ext/standard/file.c:1.514
--- php-src/ext/standard/file.c:1.513 Sun Feb 24 11:49:39 2008
+++ php-src/ext/standard/file.c Thu Feb 28 14:16:14 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.513 2008/02/24 11:49:39 felipe Exp $ */
+/* $Id: file.c,v 1.514 2008/02/28 14:16:14 felipe Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -957,8 +957,8 @@
{
php_stream *stream;
- if (ZEND_NUM_ARGS() != 0) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
}
stream = php_stream_fopen_tmpfile();
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/head.c?r1=1.98&r2=1.99&diff_format=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.98 php-src/ext/standard/head.c:1.99
--- php-src/ext/standard/head.c:1.98 Mon Dec 31 07:12:15 2007
+++ php-src/ext/standard/head.c Thu Feb 28 14:16:14 2008
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: head.c,v 1.98 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: head.c,v 1.99 2008/02/28 14:16:14 felipe Exp $ */
#include <stdio.h>
#include "php.h"
@@ -262,8 +262,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.284&r2=1.285&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.284 php-src/ext/standard/info.c:1.285
--- php-src/ext/standard/info.c:1.284 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/info.c Thu Feb 28 14:16:14 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.284 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: info.c,v 1.285 2008/02/28 14:16:14 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1024,7 +1024,7 @@
Return the special ID used to request the PHP logo in phpinfo screens*/
PHP_FUNCTION(php_logo_guid)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1036,7 +1036,7 @@
Return the special ID used to request the PHP logo in phpinfo screens*/
PHP_FUNCTION(php_real_logo_guid)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1048,7 +1048,7 @@
Return the special ID used to request the PHP logo in phpinfo screens*/
PHP_FUNCTION(php_egg_logo_guid)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1060,7 +1060,7 @@
Return the special ID used to request the Zend logo in phpinfo screens*/
PHP_FUNCTION(zend_logo_guid)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1072,7 +1072,7 @@
Return the current SAPI module name */
PHP_FUNCTION(php_sapi_name)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/rand.c?r1=1.75&r2=1.76&diff_format=u
Index: php-src/ext/standard/rand.c
diff -u php-src/ext/standard/rand.c:1.75 php-src/ext/standard/rand.c:1.76
--- php-src/ext/standard/rand.c:1.75 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/rand.c Thu Feb 28 14:16:14 2008
@@ -23,7 +23,7 @@
| Shawn Cokus <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: rand.c,v 1.75 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: rand.c,v 1.76 2008/02/28 14:16:14 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.112&r2=1.113&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.112
php-src/ext/standard/streamsfuncs.c:1.113
--- php-src/ext/standard/streamsfuncs.c:1.112 Sun Feb 3 16:14:44 2008
+++ php-src/ext/standard/streamsfuncs.c Thu Feb 28 14:16:14 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.112 2008/02/03 16:14:44 iliaa Exp $ */
+/* $Id: streamsfuncs.c,v 1.113 2008/02/28 14:16:14 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -566,8 +566,8 @@
uint 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())) {
@@ -594,8 +594,8 @@
uint 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.670&r2=1.671&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.670 php-src/ext/standard/string.c:1.671
--- php-src/ext/standard/string.c:1.670 Sat Feb 23 18:29:16 2008
+++ php-src/ext/standard/string.c Thu Feb 28 14:16:14 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.670 2008/02/23 18:29:16 felipe Exp $ */
+/* $Id: string.c,v 1.671 2008/02/28 14:16:14 felipe Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -7172,7 +7172,7 @@
int len, i;
/* We don't need no stinkin' parameters... */
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/syslog.c?r1=1.58&r2=1.59&diff_format=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.58 php-src/ext/standard/syslog.c:1.59
--- php-src/ext/standard/syslog.c:1.58 Wed Feb 20 15:27:47 2008
+++ php-src/ext/standard/syslog.c Thu Feb 28 14:16:14 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: syslog.c,v 1.58 2008/02/20 15:27:47 iliaa Exp $ */
+/* $Id: syslog.c,v 1.59 2008/02/28 14:16:14 felipe Exp $ */
#include "php.h"
@@ -205,7 +205,7 @@
Initializes all syslog-related variables */
PHP_FUNCTION(define_syslog_variables)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -245,7 +245,7 @@
Close connection to system logger */
PHP_FUNCTION(closelog)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.52&r2=1.53&diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.52
php-src/ext/standard/user_filters.c:1.53
--- php-src/ext/standard/user_filters.c:1.52 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/user_filters.c Thu Feb 28 14:16:14 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: user_filters.c,v 1.52 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: user_filters.c,v 1.53 2008/02/28 14:16:14 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -577,8 +577,8 @@
HashPosition pos;
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/unicode/collator.c?r1=1.15&r2=1.16&diff_format=u
Index: php-src/ext/unicode/collator.c
diff -u php-src/ext/unicode/collator.c:1.15 php-src/ext/unicode/collator.c:1.16
--- php-src/ext/unicode/collator.c:1.15 Fri Nov 2 16:19:57 2007
+++ php-src/ext/unicode/collator.c Thu Feb 28 14:16:24 2008
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: collator.c,v 1.15 2007/11/02 16:19:57 jani Exp $ */
+/* $Id: collator.c,v 1.16 2008/02/28 14:16:24 felipe Exp $ */
#include "php.h"
#include "ext/standard/php_array.h"
@@ -332,7 +332,7 @@
Returns default collator */
PHP_FUNCTION(collator_get_default)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/locale.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/unicode/locale.c
diff -u php-src/ext/unicode/locale.c:1.11 php-src/ext/unicode/locale.c:1.12
--- php-src/ext/unicode/locale.c:1.11 Mon Jan 1 09:29:33 2007
+++ php-src/ext/unicode/locale.c Thu Feb 28 14:16:24 2008
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: locale.c,v 1.11 2007/01/01 09:29:33 sebastian Exp $ */
+/* $Id: locale.c,v 1.12 2008/02/28 14:16:24 felipe Exp $ */
#include "php_unicode.h"
#include "unicode/ubrk.h"
@@ -42,7 +42,7 @@
Returns default locale */
PHP_FUNCTION(locale_get_default)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/unicode.c?r1=1.45&r2=1.46&diff_format=u
Index: php-src/ext/unicode/unicode.c
diff -u php-src/ext/unicode/unicode.c:1.45 php-src/ext/unicode/unicode.c:1.46
--- php-src/ext/unicode/unicode.c:1.45 Thu Sep 27 18:28:42 2007
+++ php-src/ext/unicode/unicode.c Thu Feb 28 14:16:24 2008
@@ -15,7 +15,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: unicode.c,v 1.45 2007/09/27 18:28:42 dmitry Exp $ */
+/* $Id: unicode.c,v 1.46 2008/02/28 14:16:24 felipe Exp $ */
#include "php_unicode.h"
#include "zend_unicode.h"
@@ -224,7 +224,7 @@
Returns global substitution character for conversion from Unicode to
codepage */
PHP_FUNCTION(unicode_get_subst_char)
{
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/unicode_iterators.c?r1=1.47&r2=1.48&diff_format=u
Index: php-src/ext/unicode/unicode_iterators.c
diff -u php-src/ext/unicode/unicode_iterators.c:1.47
php-src/ext/unicode/unicode_iterators.c:1.48
--- php-src/ext/unicode/unicode_iterators.c:1.47 Sun Oct 7 05:15:06 2007
+++ php-src/ext/unicode/unicode_iterators.c Thu Feb 28 14:16:24 2008
@@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: unicode_iterators.c,v 1.47 2007/10/07 05:15:06 davidw Exp $ */
+/* $Id: unicode_iterators.c,v 1.48 2008/02/28 14:16:24 felipe Exp $ */
/*
* TODO
@@ -1043,7 +1043,7 @@
zval *object = getThis();
text_iter_obj *intern = (text_iter_obj*)
zend_object_store_get_object(object TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1087,7 +1087,7 @@
zval *object = getThis();
text_iter_obj *intern = (text_iter_obj*)
zend_object_store_get_object(object TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1102,7 +1102,7 @@
zval *object = getThis();
text_iter_obj *intern = (text_iter_obj*)
zend_object_store_get_object(object TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1118,7 +1118,7 @@
zval *object = getThis();
text_iter_obj *intern = (text_iter_obj*)
zend_object_store_get_object(object TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1140,7 +1140,7 @@
zval *object = getThis();
text_iter_obj *intern = (text_iter_obj*)
zend_object_store_get_object(object TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1162,7 +1162,7 @@
zval *object = getThis();
text_iter_obj *intern = (text_iter_obj*)
zend_object_store_get_object(object TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1267,7 +1267,7 @@
{
int32_t count, i;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1286,7 +1286,7 @@
zval *object = getThis();
text_iter_obj *intern = (text_iter_obj*)
zend_object_store_get_object(object TSRMLS_CC);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1308,7 +1308,7 @@
text_iter_obj *intern = (text_iter_obj*)
zend_object_store_get_object(object TSRMLS_CC);
UErrorCode status = U_ZERO_ERROR;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
@@ -1344,7 +1344,7 @@
text_iter_obj *intern = (text_iter_obj*)
zend_object_store_get_object(object TSRMLS_CC);
text_iter_ops *ops = iter_ops[intern->type];
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") == FAILURE) {
+ if (zend_parse_parameters_none() == FAILURE) {
return;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.54&r2=1.55&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.54
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.55
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.54 Mon Dec 31 07:12:17 2007
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Thu Feb 28 14:16:25 2008
@@ -51,7 +51,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.54 2007/12/31 07:12:17 sebastian Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.55 2008/02/28 14:16:25 felipe Exp $ */
/**********************************************************************
* BUGS: *
@@ -785,8 +785,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/sapi/apache_hooks/php_apache.c?r1=1.31&r2=1.32&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.31
php-src/sapi/apache_hooks/php_apache.c:1.32
--- php-src/sapi/apache_hooks/php_apache.c:1.31 Mon Dec 31 07:12:19 2007
+++ php-src/sapi/apache_hooks/php_apache.c Thu Feb 28 14:16:25 2008
@@ -17,7 +17,7 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.31 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.32 2008/02/28 14:16:25 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
