MFH: New way for check void parameters

This commit is contained in:
Felipe Pena 2008-03-10 22:15:36 +00:00
parent cc2b17d51d
commit 84a8bb038a
40 changed files with 226 additions and 228 deletions

View file

@ -658,8 +658,8 @@ PHP_FUNCTION(com_create_guid)
GUID retval; GUID retval;
OLECHAR *guid_string; OLECHAR *guid_string;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
php_com_initialize(TSRMLS_C); php_com_initialize(TSRMLS_C);

View file

@ -55,8 +55,8 @@ PHP_FUNCTION(curl_multi_init)
{ {
php_curlm *mh; php_curlm *mh;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
mh = ecalloc(1, sizeof(php_curlm)); mh = ecalloc(1, sizeof(php_curlm));

View file

@ -298,8 +298,8 @@ struct _php_timezone_obj {
php_date_obj *obj; \ php_date_obj *obj; \
DATE_SET_CONTEXT; \ DATE_SET_CONTEXT; \
if (object) { \ if (object) { \
if (ZEND_NUM_ARGS()) { \ if (zend_parse_parameters_none() == FAILURE) { \
WRONG_PARAM_COUNT; \ return; \
} \ } \
} else { \ } else { \
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "O", &object, date_ce_date) == FAILURE) { \ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "O", &object, date_ce_date) == FAILURE) { \

View file

@ -1200,8 +1200,7 @@ PHP_FUNCTION(dba_list)
zend_rsrc_list_entry *le; zend_rsrc_list_entry *le;
dba_info *info; dba_info *info;
if (ZEND_NUM_ARGS()!=0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
RETURN_FALSE; RETURN_FALSE;
} }

View file

@ -138,8 +138,7 @@ entry = zend_register_internal_class_ex(&ce, parent_ce, NULL TSRMLS_CC);
} }
#define DOM_NO_ARGS() \ #define DOM_NO_ARGS() \
if (ZEND_NUM_ARGS() != 0) { \ if (zend_parse_parameters_none() == FAILURE) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expects exactly 0 parameters, %d given", ZEND_NUM_ARGS()); \
return; \ return; \
} }

View file

@ -528,8 +528,8 @@ PHP_FUNCTION(fdf_create)
FDFDoc fdf; FDFDoc fdf;
FDFErc err; FDFErc err;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
err = FDFCreate(&fdf); err = FDFCreate(&fdf);

View file

@ -835,8 +835,8 @@ PHP_FUNCTION(filter_list)
{ {
int i, size = sizeof(filter_list) / sizeof(filter_list_entry); int i, size = sizeof(filter_list) / sizeof(filter_list_entry);
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
array_init(return_value); array_init(return_value);

View file

@ -1440,8 +1440,7 @@ PHP_MINFO_FUNCTION(gd)
*/ */
PHP_FUNCTION(gd_info) PHP_FUNCTION(gd_info)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT();
RETURN_FALSE; RETURN_FALSE;
} }
@ -2383,8 +2382,8 @@ PHP_FUNCTION(imagetypes)
ret |= 16; ret |= 16;
#endif #endif
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_LONG(ret); RETURN_LONG(ret);

View file

@ -3658,8 +3658,8 @@ PHP_FUNCTION(imap_alerts)
{ {
STRINGLIST *cur=NIL; STRINGLIST *cur=NIL;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
if (IMAPG(imap_alertstack) == NIL) { if (IMAPG(imap_alertstack) == NIL) {
@ -3685,8 +3685,8 @@ PHP_FUNCTION(imap_errors)
{ {
ERRORLIST *cur=NIL; ERRORLIST *cur=NIL;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
if (IMAPG(imap_errorstack) == NIL) { if (IMAPG(imap_errorstack) == NIL) {
@ -3712,8 +3712,8 @@ PHP_FUNCTION(imap_last_error)
{ {
ERRORLIST *cur=NIL; ERRORLIST *cur=NIL;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
if (IMAPG(imap_errorstack) == NIL) { if (IMAPG(imap_errorstack) == NIL) {

View file

@ -203,8 +203,8 @@ int le_link, le_plink, le_trans;
Return error message */ Return error message */
PHP_FUNCTION(ibase_errmsg) PHP_FUNCTION(ibase_errmsg)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
if (IBG(sql_code) != 0) { if (IBG(sql_code) != 0) {
@ -219,8 +219,8 @@ PHP_FUNCTION(ibase_errmsg)
Return error code */ Return error code */
PHP_FUNCTION(ibase_errcode) PHP_FUNCTION(ibase_errcode)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
if (IBG(sql_code) != 0) { if (IBG(sql_code) != 0) {

View file

@ -95,8 +95,8 @@ PHP_MINFO_FUNCTION(mhash)
Gets the number of available hashes */ Gets the number of available hashes */
PHP_FUNCTION(mhash_count) PHP_FUNCTION(mhash_count)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_LONG(mhash_count()); RETURN_LONG(mhash_count());

View file

@ -443,8 +443,8 @@ static SWFBitmap getBitmap(zval *id TSRMLS_DC)
Returns the width of this bitmap */ Returns the width of this bitmap */
PHP_METHOD(swfbitmap, getWidth) PHP_METHOD(swfbitmap, getWidth)
{ {
if(ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_DOUBLE(SWFBitmap_getWidth(getBitmap(getThis() TSRMLS_CC))); RETURN_DOUBLE(SWFBitmap_getWidth(getBitmap(getThis() TSRMLS_CC)));
} }
@ -454,8 +454,8 @@ PHP_METHOD(swfbitmap, getWidth)
Returns the height of this bitmap */ Returns the height of this bitmap */
PHP_METHOD(swfbitmap, getHeight) PHP_METHOD(swfbitmap, getHeight)
{ {
if(ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_DOUBLE(SWFBitmap_getHeight(getBitmap(getThis() TSRMLS_CC))); RETURN_DOUBLE(SWFBitmap_getHeight(getBitmap(getThis() TSRMLS_CC)));
} }
@ -1056,9 +1056,9 @@ PHP_METHOD(swfdisplayitem, remove)
{ {
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC); SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
SWFDisplayItem_remove(item); SWFDisplayItem_remove(item);
} }
/* }}} */ /* }}} */
@ -1086,9 +1086,9 @@ PHP_METHOD(swfdisplayitem, endMask)
{ {
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC); SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
SWFDisplayItem_endMask(item); SWFDisplayItem_endMask(item);
} }
/* }}} */ /* }}} */
@ -1100,9 +1100,9 @@ PHP_METHOD(swfdisplayitem, getX)
float ret; float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC); SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
ret = SWFDisplayItem_get_x(item); ret = SWFDisplayItem_get_x(item);
RETURN_DOUBLE(ret); RETURN_DOUBLE(ret);
} }
@ -1115,9 +1115,9 @@ PHP_METHOD(swfdisplayitem, getY)
float ret; float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC); SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
ret = SWFDisplayItem_get_y(item); ret = SWFDisplayItem_get_y(item);
RETURN_DOUBLE(ret); RETURN_DOUBLE(ret);
} }
@ -1130,9 +1130,9 @@ PHP_METHOD(swfdisplayitem, getXScale)
float ret; float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC); SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
ret = SWFDisplayItem_get_xScale(item); ret = SWFDisplayItem_get_xScale(item);
RETURN_DOUBLE(ret); RETURN_DOUBLE(ret);
} }
@ -1145,9 +1145,9 @@ PHP_METHOD(swfdisplayitem, getYScale)
float ret; float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC); SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
ret = SWFDisplayItem_get_yScale(item); ret = SWFDisplayItem_get_yScale(item);
RETURN_DOUBLE(ret); RETURN_DOUBLE(ret);
} }
@ -1160,9 +1160,9 @@ PHP_METHOD(swfdisplayitem, getXSkew)
float ret; float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC); SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
ret = SWFDisplayItem_get_xSkew(item); ret = SWFDisplayItem_get_xSkew(item);
RETURN_DOUBLE(ret); RETURN_DOUBLE(ret);
} }
@ -1175,9 +1175,9 @@ PHP_METHOD(swfdisplayitem, getYSkew)
float ret; float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC); SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
ret = SWFDisplayItem_get_ySkew(item); ret = SWFDisplayItem_get_ySkew(item);
RETURN_DOUBLE(ret); RETURN_DOUBLE(ret);
} }
@ -1190,9 +1190,9 @@ PHP_METHOD(swfdisplayitem, getRot)
float ret; float ret;
SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC); SWFDisplayItem item = getDisplayItem(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
ret = SWFDisplayItem_get_rot(item); ret = SWFDisplayItem_get_rot(item);
RETURN_DOUBLE(ret); RETURN_DOUBLE(ret);
} }
@ -1547,8 +1547,8 @@ PHP_METHOD(swffont, getWideWidth)
Returns the ascent of the font, or 0 if not available */ Returns the ascent of the font, or 0 if not available */
PHP_METHOD(swffont, getAscent) PHP_METHOD(swffont, getAscent)
{ {
if(ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_DOUBLE(SWFFont_getAscent(getFont(getThis() TSRMLS_CC))); RETURN_DOUBLE(SWFFont_getAscent(getFont(getThis() TSRMLS_CC)));
} }
@ -1558,8 +1558,8 @@ PHP_METHOD(swffont, getAscent)
Returns the descent of the font, or 0 if not available */ Returns the descent of the font, or 0 if not available */
PHP_METHOD(swffont, getDescent) PHP_METHOD(swffont, getDescent)
{ {
if(ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_DOUBLE(SWFFont_getDescent(getFont(getThis() TSRMLS_CC))); RETURN_DOUBLE(SWFFont_getDescent(getFont(getThis() TSRMLS_CC)));
} }
@ -1569,8 +1569,8 @@ PHP_METHOD(swffont, getDescent)
Returns the leading of the font, or 0 if not available */ Returns the leading of the font, or 0 if not available */
PHP_METHOD(swffont, getLeading) PHP_METHOD(swffont, getLeading)
{ {
if(ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_DOUBLE(SWFFont_getLeading(getFont(getThis() TSRMLS_CC))); RETURN_DOUBLE(SWFFont_getLeading(getFont(getThis() TSRMLS_CC)));
} }
@ -1879,9 +1879,9 @@ PHP_METHOD(swfsoundinstance, noMultiple)
{ {
SWFSoundInstance inst = getSoundInstance(getThis() TSRMLS_CC); SWFSoundInstance inst = getSoundInstance(getThis() TSRMLS_CC);
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
SWFSoundInstance_setNoMultiple(inst); SWFSoundInstance_setNoMultiple(inst);
} }
/* }}} */ /* }}} */
@ -2031,9 +2031,9 @@ PHP_METHOD(swfvideostream, setdimension)
/* {{{ getNumFrames */ /* {{{ getNumFrames */
PHP_METHOD(swfvideostream, getnumframes) PHP_METHOD(swfvideostream, getnumframes)
{ {
if(ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
}
RETURN_LONG(SWFVideoStream_getNumFrames(getVideoStream(getThis() TSRMLS_CC))); RETURN_LONG(SWFVideoStream_getNumFrames(getVideoStream(getThis() TSRMLS_CC)));
} }
/* }}} */ /* }}} */
@ -3748,8 +3748,8 @@ PHP_METHOD(swftext, getWideWidth)
Returns the ascent of the current font at its current size, or 0 if not available */ Returns the ascent of the current font at its current size, or 0 if not available */
PHP_METHOD(swftext, getAscent) PHP_METHOD(swftext, getAscent)
{ {
if(ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_DOUBLE(SWFText_getAscent(getText(getThis() TSRMLS_CC))); RETURN_DOUBLE(SWFText_getAscent(getText(getThis() TSRMLS_CC)));
} }
@ -3759,8 +3759,8 @@ PHP_METHOD(swftext, getAscent)
Returns the descent of the current font at its current size, or 0 if not available */ Returns the descent of the current font at its current size, or 0 if not available */
PHP_METHOD(swftext, getDescent) PHP_METHOD(swftext, getDescent)
{ {
if(ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_DOUBLE(SWFText_getDescent(getText(getThis() TSRMLS_CC))); RETURN_DOUBLE(SWFText_getDescent(getText(getThis() TSRMLS_CC)));
} }
@ -3770,8 +3770,8 @@ PHP_METHOD(swftext, getDescent)
Returns the leading of the current font at its current size, or 0 if not available */ Returns the leading of the current font at its current size, or 0 if not available */
PHP_METHOD(swftext, getLeading) PHP_METHOD(swftext, getLeading)
{ {
if(ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_DOUBLE(SWFText_getLeading(getText(getThis() TSRMLS_CC))); RETURN_DOUBLE(SWFText_getLeading(getText(getThis() TSRMLS_CC)));
} }

View file

@ -747,8 +747,8 @@ PHP_FUNCTION(msql_list_fields)
Returns the text of the error message from previous mSQL operation */ Returns the text of the error message from previous mSQL operation */
PHP_FUNCTION(msql_error) PHP_FUNCTION(msql_error)
{ {
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRING(msqlErrMsg,1); RETURN_STRING(msqlErrMsg,1);
} }

View file

@ -1003,8 +1003,8 @@ PHP_FUNCTION(mysql_select_db)
Returns a string that represents the client library version */ Returns a string that represents the client library version */
PHP_FUNCTION(mysql_get_client_info) PHP_FUNCTION(mysql_get_client_info)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRING((char *)mysql_get_client_info(),1); RETURN_STRING((char *)mysql_get_client_info(),1);

View file

@ -782,8 +782,8 @@ PHP_FUNCTION(odbc_close_all)
int i; int i;
int nument; int nument;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
nument = zend_hash_next_free_element(&EG(regular_list)); nument = zend_hash_next_free_element(&EG(regular_list));

View file

@ -3648,8 +3648,8 @@ PHP_FUNCTION(openssl_error_string)
char buf[512]; char buf[512];
unsigned long val; unsigned long val;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
val = ERR_get_error(); val = ERR_get_error();

View file

@ -972,8 +972,8 @@ static PHP_METHOD(PDO, errorCode)
{ {
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
RETURN_FALSE; return;
} }
PDO_CONSTRUCT_CHECK; PDO_CONSTRUCT_CHECK;
@ -991,8 +991,8 @@ static PHP_METHOD(PDO, errorInfo)
{ {
pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC);
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
PDO_CONSTRUCT_CHECK; PDO_CONSTRUCT_CHECK;
@ -1134,8 +1134,8 @@ static PHP_METHOD(PDO, getAvailableDrivers)
HashPosition pos; HashPosition pos;
pdo_driver_t **pdriver; pdo_driver_t **pdriver;
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
array_init(return_value); array_init(return_value);

View file

@ -1729,8 +1729,8 @@ static PHP_METHOD(PDOStatement, errorCode)
{ {
PHP_STMT_GET_OBJ; PHP_STMT_GET_OBJ;
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
RETURN_FALSE; return;
} }
RETURN_STRING(stmt->error_code, 1); RETURN_STRING(stmt->error_code, 1);
@ -1743,8 +1743,8 @@ static PHP_METHOD(PDOStatement, errorInfo)
{ {
PHP_STMT_GET_OBJ; PHP_STMT_GET_OBJ;
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
RETURN_FALSE; return;
} }
array_init(return_value); array_init(return_value);
@ -1844,8 +1844,8 @@ static PHP_METHOD(PDOStatement, getAttribute)
static PHP_METHOD(PDOStatement, columnCount) static PHP_METHOD(PDOStatement, columnCount)
{ {
PHP_STMT_GET_OBJ; PHP_STMT_GET_OBJ;
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
RETURN_FALSE; return;
} }
RETURN_LONG(stmt->column_count); RETURN_LONG(stmt->column_count);
} }

View file

@ -209,7 +209,7 @@ zend_module_entry posix_module_entry = {
ZEND_GET_MODULE(posix) ZEND_GET_MODULE(posix)
#endif #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) \ #define PHP_POSIX_RETURN_LONG_FUNC(func_name) \
PHP_POSIX_NO_ARGS \ PHP_POSIX_NO_ARGS \

View file

@ -1411,8 +1411,8 @@ PHP_FUNCTION(session_set_cookie_params)
Return the session cookie parameters */ Return the session cookie parameters */
PHP_FUNCTION(session_get_cookie_params) PHP_FUNCTION(session_get_cookie_params)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
array_init(return_value); array_init(return_value);
@ -1763,8 +1763,8 @@ PHP_FUNCTION(session_encode)
int len; int len;
char *enc; char *enc;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
enc = php_session_encode(&len TSRMLS_CC); enc = php_session_encode(&len TSRMLS_CC);
@ -1812,8 +1812,8 @@ PHP_FUNCTION(session_start)
Destroy the current session and all data associated with it */ Destroy the current session and all data associated with it */
PHP_FUNCTION(session_destroy) PHP_FUNCTION(session_destroy)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
if (php_session_destroy(TSRMLS_C) == SUCCESS) { if (php_session_destroy(TSRMLS_C) == SUCCESS) {

View file

@ -197,7 +197,7 @@ END {
ints = ints "\tint argc = ZEND_NUM_ARGS();\n" ints = ints "\tint argc = ZEND_NUM_ARGS();\n"
fetchargs = fetchargs "argc TSRMLS_CC, " specs[i] fetchargs = fetchargs "argc TSRMLS_CC, " specs[i]
} else { } 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" xmlparams = xmlparams " <void/>\n"
} }

View file

@ -693,8 +693,8 @@ PHP_FUNCTION(snmprealwalk)
Return the current status of quick_print */ Return the current status of quick_print */
PHP_FUNCTION(snmp_get_quick_print) PHP_FUNCTION(snmp_get_quick_print)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
#ifdef HAVE_NET_SNMP #ifdef HAVE_NET_SNMP

View file

@ -821,8 +821,8 @@ PHP_METHOD(SoapFault, __toString)
zend_fcall_info fci; zend_fcall_info fci;
zval fname; zval fname;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
faultcode = zend_read_property(soap_fault_class_entry, this_ptr, "faultcode", sizeof("faultcode")-1, 1 TSRMLS_CC); faultcode = zend_read_property(soap_fault_class_entry, this_ptr, "faultcode", sizeof("faultcode")-1, 1 TSRMLS_CC);

View file

@ -2426,8 +2426,8 @@ PHP_FUNCTION(sqlite_column)
Returns the version of the linked SQLite library. */ Returns the version of the linked SQLite library. */
PHP_FUNCTION(sqlite_libversion) PHP_FUNCTION(sqlite_libversion)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRING((char*)sqlite_libversion(), 1); RETURN_STRING((char*)sqlite_libversion(), 1);
} }
@ -2437,8 +2437,8 @@ PHP_FUNCTION(sqlite_libversion)
Returns the encoding (iso8859 or UTF-8) of the linked SQLite library. */ Returns the encoding (iso8859 or UTF-8) of the linked SQLite library. */
PHP_FUNCTION(sqlite_libencoding) PHP_FUNCTION(sqlite_libencoding)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRING((char*)sqlite_libencoding(), 1); RETURN_STRING((char*)sqlite_libencoding(), 1);
} }
@ -2453,8 +2453,8 @@ PHP_FUNCTION(sqlite_changes)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
DB_FROM_OBJECT(db, object); DB_FROM_OBJECT(db, object);
} else { } else {
@ -2477,8 +2477,8 @@ PHP_FUNCTION(sqlite_last_insert_rowid)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
DB_FROM_OBJECT(db, object); DB_FROM_OBJECT(db, object);
} else { } else {
@ -2514,8 +2514,8 @@ PHP_FUNCTION(sqlite_num_rows)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
RES_FROM_OBJECT(res, object); RES_FROM_OBJECT(res, object);
} else { } else {
@ -2543,8 +2543,8 @@ PHP_FUNCTION(sqlite_valid)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
RES_FROM_OBJECT(res, object); RES_FROM_OBJECT(res, object);
} else { } else {
@ -2567,8 +2567,8 @@ PHP_FUNCTION(sqlite_has_prev)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
RES_FROM_OBJECT(res, object); RES_FROM_OBJECT(res, object);
} else { } else {
@ -2596,8 +2596,8 @@ PHP_FUNCTION(sqlite_num_fields)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
RES_FROM_OBJECT(res, object); RES_FROM_OBJECT(res, object);
} else { } else {
@ -2686,8 +2686,8 @@ PHP_FUNCTION(sqlite_rewind)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
RES_FROM_OBJECT(res, object); RES_FROM_OBJECT(res, object);
} else { } else {
@ -2721,8 +2721,8 @@ PHP_FUNCTION(sqlite_next)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
RES_FROM_OBJECT(res, object); RES_FROM_OBJECT(res, object);
} else { } else {
@ -2756,8 +2756,8 @@ PHP_FUNCTION(sqlite_key)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
RES_FROM_OBJECT(res, object); RES_FROM_OBJECT(res, object);
} else { } else {
@ -2780,8 +2780,8 @@ PHP_FUNCTION(sqlite_prev)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
RES_FROM_OBJECT(res, object); RES_FROM_OBJECT(res, object);
} else { } else {
@ -2849,8 +2849,8 @@ PHP_FUNCTION(sqlite_last_error)
zval *object = getThis(); zval *object = getThis();
if (object) { if (object) {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT return;
} }
DB_FROM_OBJECT(db, object); DB_FROM_OBJECT(db, object);
} else { } else {

View file

@ -1,3 +1,4 @@
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP Version 5 | | PHP Version 5 |
@ -4866,8 +4867,8 @@ PHP_FUNCTION(time_sleep_until)
Get the name of the owner of the current PHP script */ Get the name of the owner of the current PHP script */
PHP_FUNCTION(get_current_user) PHP_FUNCTION(get_current_user)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRING(php_get_current_user(), 1); RETURN_STRING(php_get_current_user(), 1);

View file

@ -333,8 +333,8 @@ PHP_FUNCTION(getcwd)
char path[MAXPATHLEN]; char path[MAXPATHLEN];
char *ret=NULL; char *ret=NULL;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
#if HAVE_GETCWD #if HAVE_GETCWD

View file

@ -730,8 +730,8 @@ PHPAPI void php_clear_stat_cache(TSRMLS_D)
Clear file stat cache */ Clear file stat cache */
PHP_FUNCTION(clearstatcache) PHP_FUNCTION(clearstatcache)
{ {
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
php_clear_stat_cache(TSRMLS_C); php_clear_stat_cache(TSRMLS_C);
} }

View file

@ -246,8 +246,8 @@ static void php_head_apply_header_list_to_hash(void *data, void *arg TSRMLS_DC)
Return list of headers to be sent / already sent */ Return list of headers to be sent / already sent */
PHP_FUNCTION(headers_list) PHP_FUNCTION(headers_list)
{ {
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
if (!&SG(sapi_headers).headers) { if (!&SG(sapi_headers).headers) {

View file

@ -1082,8 +1082,8 @@ PHPAPI char *php_logo_guid(void)
PHP_FUNCTION(php_logo_guid) PHP_FUNCTION(php_logo_guid)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRING(php_logo_guid(), 0); RETURN_STRING(php_logo_guid(), 0);
@ -1095,8 +1095,8 @@ PHP_FUNCTION(php_logo_guid)
PHP_FUNCTION(php_real_logo_guid) PHP_FUNCTION(php_real_logo_guid)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRINGL(PHP_LOGO_GUID, sizeof(PHP_LOGO_GUID)-1, 1); RETURN_STRINGL(PHP_LOGO_GUID, sizeof(PHP_LOGO_GUID)-1, 1);
@ -1107,8 +1107,8 @@ PHP_FUNCTION(php_real_logo_guid)
Return the special ID used to request the PHP logo in phpinfo screens*/ Return the special ID used to request the PHP logo in phpinfo screens*/
PHP_FUNCTION(php_egg_logo_guid) PHP_FUNCTION(php_egg_logo_guid)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1); RETURN_STRINGL(PHP_EGG_LOGO_GUID, sizeof(PHP_EGG_LOGO_GUID)-1, 1);
@ -1119,8 +1119,8 @@ PHP_FUNCTION(php_egg_logo_guid)
Return the special ID used to request the Zend logo in phpinfo screens*/ Return the special ID used to request the Zend logo in phpinfo screens*/
PHP_FUNCTION(zend_logo_guid) PHP_FUNCTION(zend_logo_guid)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRINGL(ZEND_LOGO_GUID, sizeof(ZEND_LOGO_GUID)-1, 1); RETURN_STRINGL(ZEND_LOGO_GUID, sizeof(ZEND_LOGO_GUID)-1, 1);
@ -1131,8 +1131,8 @@ PHP_FUNCTION(zend_logo_guid)
Return the current SAPI module name */ Return the current SAPI module name */
PHP_FUNCTION(php_sapi_name) PHP_FUNCTION(php_sapi_name)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
if (sapi_module.name) { if (sapi_module.name) {

View file

@ -351,8 +351,8 @@ PHP_FUNCTION(mt_rand)
Returns the maximum value a random number can have */ Returns the maximum value a random number can have */
PHP_FUNCTION(getrandmax) PHP_FUNCTION(getrandmax)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_LONG(PHP_RAND_MAX); RETURN_LONG(PHP_RAND_MAX);
@ -363,8 +363,8 @@ PHP_FUNCTION(getrandmax)
Returns the maximum value a random number from Mersenne Twister can have */ Returns the maximum value a random number from Mersenne Twister can have */
PHP_FUNCTION(mt_getrandmax) PHP_FUNCTION(mt_getrandmax)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
/* /*

View file

@ -520,8 +520,8 @@ PHP_FUNCTION(stream_get_transports)
int stream_xport_len; int stream_xport_len;
ulong num_key; ulong num_key;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
if ((stream_xport_hash = php_stream_xport_get_hash())) { if ((stream_xport_hash = php_stream_xport_get_hash())) {
@ -548,8 +548,8 @@ PHP_FUNCTION(stream_get_wrappers)
int key_flags, stream_protocol_len = 0; int key_flags, stream_protocol_len = 0;
ulong num_key; ulong num_key;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) { if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) {

View file

@ -4683,8 +4683,8 @@ PHP_FUNCTION(localeconv)
int len, i; int len, i;
/* We don't need no stinkin' parameters... */ /* We don't need no stinkin' parameters... */
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
MAKE_STD_ZVAL(grouping); MAKE_STD_ZVAL(grouping);

View file

@ -203,8 +203,8 @@ static void start_syslog(TSRMLS_D)
Initializes all syslog-related variables */ Initializes all syslog-related variables */
PHP_FUNCTION(define_syslog_variables) PHP_FUNCTION(define_syslog_variables)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
if (!BG(syslog_started)) { if (!BG(syslog_started)) {
@ -243,8 +243,8 @@ PHP_FUNCTION(openlog)
Close connection to system logger */ Close connection to system logger */
PHP_FUNCTION(closelog) PHP_FUNCTION(closelog)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
closelog(); closelog();

View file

@ -534,8 +534,8 @@ PHP_FUNCTION(stream_get_filters)
HashTable *filters_hash; HashTable *filters_hash;
ulong num_key; ulong num_key;
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
array_init(return_value); array_init(return_value);

View file

@ -50,8 +50,8 @@
PHPTidyObj *obj; \ PHPTidyObj *obj; \
TIDY_SET_CONTEXT; \ TIDY_SET_CONTEXT; \
if (object) { \ if (object) { \
if (ZEND_NUM_ARGS()) { \ if (zend_parse_parameters_none() == FAILURE) { \
WRONG_PARAM_COUNT; \ return; \
} \ } \
} else { \ } else { \
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, NULL, "O", &object, tidy_ce_doc) == FAILURE) { \ 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 \ #define TIDY_FETCH_ONLY_OBJECT \
PHPTidyObj *obj; \ PHPTidyObj *obj; \
TIDY_SET_CONTEXT; \ TIDY_SET_CONTEXT; \
if (ZEND_NUM_ARGS()) { \ if (zend_parse_parameters_none() == FAILURE) { \
WRONG_PARAM_COUNT; \ return; \
} \ } \
obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC); \ obj = (PHPTidyObj *) zend_object_store_get_object(object TSRMLS_CC); \
@ -1204,8 +1204,8 @@ static PHP_FUNCTION(tidy_diagnose)
Get release date (version) for Tidy library */ Get release date (version) for Tidy library */
static PHP_FUNCTION(tidy_get_release) static PHP_FUNCTION(tidy_get_release)
{ {
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
RETURN_STRING((char *)tidyReleaseDate(), 1); RETURN_STRING((char *)tidyReleaseDate(), 1);

View file

@ -794,8 +794,8 @@ PHP_FUNCTION(xmlrpc_decode)
Creates an xmlrpc server */ Creates an xmlrpc server */
PHP_FUNCTION(xmlrpc_server_create) PHP_FUNCTION(xmlrpc_server_create)
{ {
if(ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
if(return_value_used) { if(return_value_used) {

View file

@ -464,8 +464,8 @@ static void php_xmlwriter_end(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_int_t
if (this) { if (this) {
XMLWRITER_FROM_OBJECT(intern, this); XMLWRITER_FROM_OBJECT(intern, this);
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
} else } else
#endif #endif

View file

@ -758,8 +758,8 @@ PHP_FUNCTION(ob_start)
Flush (send) contents of the output buffer. The last buffer content is sent to next buffer */ Flush (send) contents of the output buffer. The last buffer content is sent to next buffer */
PHP_FUNCTION(ob_flush) PHP_FUNCTION(ob_flush)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
if (!OG(ob_nesting_level)) { if (!OG(ob_nesting_level)) {
@ -777,8 +777,8 @@ PHP_FUNCTION(ob_flush)
Clean (delete) the current output buffer */ Clean (delete) the current output buffer */
PHP_FUNCTION(ob_clean) PHP_FUNCTION(ob_clean)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
if (!OG(ob_nesting_level)) { if (!OG(ob_nesting_level)) {
@ -800,8 +800,8 @@ PHP_FUNCTION(ob_clean)
Flush (send) the output buffer, and delete current output buffer */ Flush (send) the output buffer, and delete current output buffer */
PHP_FUNCTION(ob_end_flush) PHP_FUNCTION(ob_end_flush)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
if (!OG(ob_nesting_level)) { if (!OG(ob_nesting_level)) {
@ -822,8 +822,8 @@ PHP_FUNCTION(ob_end_flush)
Clean the output buffer, and delete current output buffer */ Clean the output buffer, and delete current output buffer */
PHP_FUNCTION(ob_end_clean) PHP_FUNCTION(ob_end_clean)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
if (!OG(ob_nesting_level)) { if (!OG(ob_nesting_level)) {
@ -844,8 +844,8 @@ PHP_FUNCTION(ob_end_clean)
Get current buffer contents, flush (send) the output buffer, and delete current output buffer */ Get current buffer contents, flush (send) the output buffer, and delete current output buffer */
PHP_FUNCTION(ob_get_flush) PHP_FUNCTION(ob_get_flush)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
/* get contents */ /* get contents */
@ -870,9 +870,9 @@ PHP_FUNCTION(ob_get_flush)
Get current buffer contents and delete current output buffer */ Get current buffer contents and delete current output buffer */
PHP_FUNCTION(ob_get_clean) PHP_FUNCTION(ob_get_clean)
{ {
if (ZEND_NUM_ARGS() != 0) if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
}
/* get contents */ /* get contents */
if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) { if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) {
RETURN_FALSE; RETURN_FALSE;
@ -895,8 +895,8 @@ PHP_FUNCTION(ob_get_clean)
Return the contents of the output buffer */ Return the contents of the output buffer */
PHP_FUNCTION(ob_get_contents) PHP_FUNCTION(ob_get_contents)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) { if (php_ob_get_buffer(return_value TSRMLS_CC)==FAILURE) {
@ -909,8 +909,8 @@ PHP_FUNCTION(ob_get_contents)
Return the nesting level of the output buffer */ Return the nesting level of the output buffer */
PHP_FUNCTION(ob_get_level) PHP_FUNCTION(ob_get_level)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
RETURN_LONG (OG(ob_nesting_level)); RETURN_LONG (OG(ob_nesting_level));
@ -921,8 +921,8 @@ PHP_FUNCTION(ob_get_level)
Return the length of the output buffer */ Return the length of the output buffer */
PHP_FUNCTION(ob_get_length) PHP_FUNCTION(ob_get_length)
{ {
if (ZEND_NUM_ARGS() != 0) { if (zend_parse_parameters_none() == FAILURE) {
ZEND_WRONG_PARAM_COUNT(); return;
} }
if (php_ob_get_length(return_value TSRMLS_CC)==FAILURE) { if (php_ob_get_length(return_value TSRMLS_CC)==FAILURE) {

View file

@ -179,8 +179,8 @@ PHP_FUNCTION(apache_request_headers)
const apr_array_header_t *arr; const apr_array_header_t *arr;
char *key, *val; char *key, *val;
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
array_init(return_value); array_init(return_value);
@ -203,8 +203,8 @@ PHP_FUNCTION(apache_response_headers)
const apr_array_header_t *arr; const apr_array_header_t *arr;
char *key, *val; char *key, *val;
if (ZEND_NUM_ARGS()) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
array_init(return_value); array_init(return_value);

View file

@ -164,8 +164,8 @@ static void apache_request_read_string_slot(int offset, INTERNAL_FUNCTION_PARAME
request_rec *r; request_rec *r;
char *s; char *s;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -224,8 +224,8 @@ static void apache_request_read_int_slot(int offset, INTERNAL_FUNCTION_PARAMETER
request_rec *r; request_rec *r;
long l; long l;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -683,8 +683,8 @@ PHP_FUNCTION(apache_request_server_port)
zval *id; zval *id;
request_rec *r; request_rec *r;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -766,8 +766,8 @@ PHP_FUNCTION(apache_request_set_etag)
zval *id; zval *id;
request_rec *r; request_rec *r;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -784,8 +784,8 @@ PHP_FUNCTION(apache_request_set_last_modified)
zval *id; zval *id;
request_rec *r; request_rec *r;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -802,8 +802,8 @@ PHP_FUNCTION(apache_request_meets_conditions)
zval *id; zval *id;
request_rec *r; request_rec *r;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -819,8 +819,8 @@ PHP_FUNCTION(apache_request_discard_request_body)
zval *id; zval *id;
request_rec *r; request_rec *r;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -836,8 +836,8 @@ PHP_FUNCTION(apache_request_satisfies)
zval *id; zval *id;
request_rec *r; request_rec *r;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -854,8 +854,8 @@ PHP_FUNCTION(apache_request_is_initial_req)
zval *id; zval *id;
request_rec *r; request_rec *r;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -871,8 +871,8 @@ PHP_FUNCTION(apache_request_some_auth_required)
zval *id; zval *id;
request_rec *r; request_rec *r;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -889,8 +889,8 @@ PHP_FUNCTION(apache_request_auth_type)
request_rec *r; request_rec *r;
char *t; char *t;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);
@ -911,8 +911,8 @@ PHP_FUNCTION(apache_request_auth_name)
request_rec *r; request_rec *r;
char *t; char *t;
if (ZEND_NUM_ARGS() > 0) { if (zend_parse_parameters_none() == FAILURE) {
WRONG_PARAM_COUNT; return;
} }
APREQ_GET_REQUEST(id, r); APREQ_GET_REQUEST(id, r);