Hello

Em Qui, 2008-06-19 às 16:06 -0700, Stanislav Malyshev escreveu:

Hi!

While we nearing the release of 5.3 (hopefully?), there are many
functions in the PHP code which still use old parameter parsing API
(zend_get_parameters_ex) instead of the new one (zend_parse_parameters).

Yeah, I have noticed... That's also in my TODO.

--
Regards,
Felipe Pena.

I'll take a few

2008/6/20 Stanislav Malyshev stas@zend.com:

Hi!

While we nearing the release of 5.3 (hopefully?), there are many functions
in the PHP code which still use old parameter parsing API
(zend_get_parameters_ex) instead of the new one (zend_parse_parameters).

I have cleaned up Zend engine functions, converting them to the new API,
but there are about 1000 instances throughout PHP code (especially
ext/standard) which still use the old way. This way is less correct,
inconsistent with the new code, gives worse error messages, more prone to
various bugs, etc. All new extensions and functions use the new way, and the
only reason for keeping the old way in the code seems to be that nobody
cleaned it up. Somebody has to bring the old ones into sync, and I don't
think I personally will have time to do it in near timeframe. So if anybody
could step up to that - by doing at least part of the work - that'd be
great. The work is pretty simple, taking something like:

zval **data;

if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &data) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(data);

and move it into:

char *str;
int str_len;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len)
== FAILURE) {
return;
}

and of course convert use of data zval into use of str.

This needs to be done carefully as not to break things on some more tricky
functions which may get arguments of multiple types, etc. Also, some tests
which check error messages may need to be fixed since new API gives more
detailed messages.
zend_parse_parameters documented here:
http://www.php.net/manual/en/internals2.ze1.zendapi.php
though some of the newer parameters aren't (C, h, f, Z) so one may need to
look at the code at zend_API.c.

P.S. if some genius would invent a script to automate that - it'd be
awesome, but I don't have very high hopes on that. :)

Stanislav Malyshev, Zend Software Architect
stas@zend.com http://www.zend.com/
(408)253-8829 MSN: stas@zend.com

--

--
Slan,
David

I did curl for 5.3

Hi!

While we nearing the release of 5.3 (hopefully?), there are many functions
in the PHP code which still use old parameter parsing API
(zend_get_parameters_ex) instead of the new one (zend_parse_parameters).

I have cleaned up Zend engine functions, converting them to the new API,
but there are about 1000 instances throughout PHP code (especially
ext/standard) which still use the old way. This way is less correct,
inconsistent with the new code, gives worse error messages, more prone to
various bugs, etc. All new extensions and functions use the new way, and the
only reason for keeping the old way in the code seems to be that nobody
cleaned it up. Somebody has to bring the old ones into sync, and I don't
think I personally will have time to do it in near timeframe. So if anybody
could step up to that - by doing at least part of the work - that'd be
great. The work is pretty simple, taking something like:

zval **data;

if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &data) == FAILURE) {
WRONG_PARAM_COUNT;
}
convert_to_string_ex(data);

and move it into:

char *str;
int str_len;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&str, &str_len) == FAILURE) {
return;
}

and of course convert use of data zval into use of str.

This needs to be done carefully as not to break things on some more tricky
functions which may get arguments of multiple types, etc. Also, some tests
which check error messages may need to be fixed since new API gives more
detailed messages.
zend_parse_parameters documented here:
http://www.php.net/manual/en/internals2.ze1.zendapi.php
though some of the newer parameters aren't (C, h, f, Z) so one may need to
look at the code at zend_API.c.

P.S. if some genius would invent a script to automate that - it'd be
awesome, but I don't have very high hopes on that. :)

Stanislav Malyshev, Zend Software Architect
stas@zend.com http://www.zend.com/
(408)253-8829 MSN: stas@zend.com

--

--
Alexey Zakhlestin
http://blog.milkfarmsoft.com/

While we nearing the release of 5.3 (hopefully?), there are many
functions in the PHP code which still use old parameter parsing API
(zend_get_parameters_ex) instead of the new one
(zend_parse_parameters).

is this in any way related to the parameter parsing API change that
caused the BC break in array_merge() back in PHP 5.0? If so then I
would appreciate extra care to be taken to minimize these kinds of BC
breaks and at least make sure that these breaks are well documented.

regards,
Lukas Kahwe Smith
mls@pooteeweet.org

Hi,

While we nearing the release of 5.3 (hopefully?), there are many
functions in the PHP code which still use old parameter parsing API
(zend_get_parameters_ex) instead of the new one (zend_parse_parameters).

I started taking care of ext/sybase_ct.

• Timm

Stanislav Malyshev escribió:

Hi!

While we nearing the release of 5.3 (hopefully?), there are many
functions in the PHP code which still use old parameter parsing API
(zend_get_parameters_ex) instead of the new one (zend_parse_parameters).

P.S. if some genius would invent a script to automate that - it'd be
awesome, but I don't have very high hopes on that. :)

The attached patch may also help both core and PECL extensions, emiting
a deprecation compile warning when those functions are used.

ps: you have to add the attribute to all deprecated functions ;-)

--

Cristian Rodríguez R.
Platform/OpenSUSE - Core Services
SUSE LINUX Products GmbH
Research & Development
http://www.opensuse.org/

While we nearing the release of 5.3 (hopefully?), there are many
functions in the PHP code which still use old parameter parsing API
(zend_get_parameters_ex) instead of the new one
(zend_parse_parameters).

This is my first patch submission, so please let me know if you have
any pointers. I went ahead and took care of basic_functions.c (because
i figured I'd start with basics :-) ). I'll try to do some more
tonight. Please let me know if there are any areas you would like me
to focus on.

Cheers!

--
Jordan CM Wambaugh
jordan@wambaugh.org

Index: basic_functions.c

RCS file: /repository/php-src/ext/standard/basic_functions.c,v
retrieving revision 1.725.2.31.2.64.2.35
diff -u -r1.725.2.31.2.64.2.35 basic_functions.c
--- basic_functions.c 25 May 2008 14:06:13 -0000 1.725.2.31.2.64.2.35
+++ basic_functions.c 28 Jun 2008 01:56:16 -0000
@@ -4924,18 +4924,17 @@
/* }}} */

/* {{{ proto bool set_magic_quotes_runtime(int new_setting)

• Set the current active configuration setting of
  magic_quotes_runtime and return previous */

• Set the current active configuration setting of
  magic_quotes_runtime. Return true on success, false on failure.*/
  PHP_FUNCTION(set_magic_quotes_runtime)
  {

• zval **new_setting;

• zend_bool new_setting;

• if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &new_setting)
  == FAILURE) {

• if (ZEND_NUM_ARGS() != 1 || zend_parse_parameters( 1 TSRMLS_CC, "b",
  &new_setting ) == FAILURE) {
  RETURN_FALSE;
  }

• convert_to_boolean_ex(new_setting);
• PG(magic_quotes_runtime) = (zend_bool) Z_LVAL_PP(new_setting);

• PG(magic_quotes_runtime) = new_setting;
  RETURN_TRUE;
  }
  /* }}} */
  @@ -4973,68 +4972,40 @@
  Send an error message somewhere */
  PHP_FUNCTION(error_log)
  {

• zval **string, **erropt = NULL, **option = NULL, **emailhead = NULL;

• int opt_err = 0;

• char *message, *opt = NULL, *headers = NULL;
• switch (ZEND_NUM_ARGS()) {

•   case 1:
  

•   	if (zend_get_parameters_ex(1, &string) == FAILURE) {
  

•   		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument 1 invalid");
  

•   		RETURN_FALSE;
  

•   	}
  

•   	break;
  

•   case 2:
  

•   	if (zend_get_parameters_ex(2, &string, &erropt) == FAILURE) {
  

•   		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments");
  

•   		RETURN_FALSE;
  

•   	}
  

•   	convert_to_long_ex(erropt);
  

•   	opt_err = Z_LVAL_PP(erropt);
  

•   	break;
  

•   case 3:
  

•   	if (zend_get_parameters_ex(3, &string, &erropt, &option) ==  
  

FAILURE) {

•   		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments");
  

•   		RETURN_FALSE;
  

•   	}
  

•   	convert_to_long_ex(erropt);
  

•   	opt_err = Z_LVAL_PP(erropt);
  

•   	convert_to_string_ex(option);
  

•   	opt = Z_STRVAL_PP(option);
  

•   	break;
  

• char *message, *message_dup, *opt = NULL, *opt_dup, *headers = NULL,
  *headers_dup;
• int message_len, opt_len=0, headers_len=0;

•   case 4:
  

•   	if (zend_get_parameters_ex (4, &string, &erropt, &option,  
  

&emailhead) == FAILURE) {

•   		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments");
  

•   		RETURN_FALSE;
  

•   	}
  

•   	break;
  

•   default:
  

•   	WRONG_PARAM_COUNT;
  

• if(ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 4){

•   WRONG_PARAM_COUNT;
  

  }

• convert_to_string_ex(string);
• message = Z_STRVAL_PP(string);
• if (erropt != NULL) {

•   convert_to_long_ex(erropt);
  

•   opt_err = Z_LVAL_PP(erropt);
  

• if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lss"

•   						, &message, &message_len
  

•   						, &opt_err
  

•   						, &opt, &opt_len
  

•   						, &headers, &headers_len) == FAILURE) {
  

•   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Arguments");
  

•   RETURN_FALSE;
  

  }

• if (option != NULL) {

•   convert_to_string_ex(option);
  

•   opt = Z_STRVAL_PP(option);
  

• }

• /convert our binary-safe strings to unsafe because that's what
  _php_error_log() expects/
• message_dup=estrndup(message, message_len);
• message_dup=erealloc(message_dup,message_len+1);
• message_dup[message_len]=0;
• opt_dup=estrndup(opt, opt_len);
• opt_dup=erealloc(opt_dup,opt_len+1);
• opt_dup[opt_len]=0;
• headers_dup=estrndup(headers, headers_len);
• headers_dup=erealloc(headers_dup,headers_len+1);
• headers_dup[headers_len]=0;

• if (emailhead != NULL) {

•   convert_to_string_ex(emailhead);
  

•   headers = Z_STRVAL_PP(emailhead);
  

• }

• if (_php_error_log(opt_err, message, opt, headers TSRMLS_CC) ==
  FAILURE) {

• if (_php_error_log(opt_err, message_dup, opt_dup, headers_dup
  TSRMLS_CC) == FAILURE) {
  RETURN_FALSE;
  }

I have cleaned up Zend engine functions, converting them to the new
API, but there are about 1000 instances throughout PHP code
(especially ext/standard) which still use the old way. This way is
less correct, inconsistent with the new code, gives worse error
messages, more prone to various bugs, etc. All new extensions and
functions use the new way, and the only reason for keeping the old
way in the code seems to be that nobody cleaned it up. Somebody has
to bring the old ones into sync, and I don't think I personally will
have time to do it in near timeframe. So if anybody could step up to
that - by doing at least part of the work - that'd be great. The
work is pretty simple, taking something like:

I went ahead and took care of standard/assert.c and standard/
formatted_print.c for 5.3 as well. All tests are passing.

Cheers!

--
Jordan CM Wambaugh
jordan@wambaugh.org

Index: assert.c

RCS file: /repository/php-src/ext/standard/assert.c,v
retrieving revision 1.60.2.3.2.6.2.2
diff -u -r1.60.2.3.2.6.2.2 assert.c
--- assert.c 31 Dec 2007 07:17:14 -0000 1.60.2.3.2.6.2.2
+++ assert.c 28 Jun 2008 03:39:28 -0000
@@ -139,7 +139,7 @@
Checks if assertion is false */
PHP_FUNCTION(assert)
{

• zval **assertion;

• zval *assertion;
  int val;
  char *myeval = NULL;
  char *compiled_string_description;
  @@ -148,15 +148,15 @@
  RETURN_TRUE;
  }

• if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &assertion) ==
  FAILURE) {

• if (ZEND_NUM_ARGS() != 1 || zend_parse_parameters(1 TSRMLS_CC, "z",
  &assertion) == FAILURE) {
  WRONG_PARAM_COUNT;
  }

• if (Z_TYPE_PP(assertion) == IS_STRING) {

• if (Z_TYPE_PP(&assertion) == IS_STRING) {
  zval retval;
  int old_error_reporting = 0; /* shut up gcc! */

•   myeval = Z_STRVAL_PP(assertion);
  

•   myeval = Z_STRVAL_PP(&assertion);
  
    if (ASSERTG(quiet_eval)) {
    	old_error_reporting = EG(error_reporting);
  

@@ -181,8 +181,8 @@
convert_to_boolean(&retval);
val = Z_LVAL(retval);
} else {

•   convert_to_boolean_ex(assertion);
  

•   val = Z_LVAL_PP(assertion);
  

•   convert_to_boolean_ex(&assertion);
  

•   val = Z_LVAL_PP(&assertion);
  

  }

  if (val) {
  @@ -235,26 +235,25 @@
  }
  /* }}} */

-/* {{{ proto mixed assert_options(int what [, mixed value])
+/* {{{ proto mixed assert_options(int what[, mixed value])
Set/get the various assert flags */
PHP_FUNCTION(assert_options)
{

• zval **what, **value;
• int oldint;

• zval *value=0;
• int oldint, what;
  int ac = ZEND_NUM_ARGS();

• if (ac < 1 || ac > 2 || zend_get_parameters_ex(ac, &what, &value) ==
  FAILURE) {

• if (ac <1 || ac > 2 || zend_parse_parameters(ac TSRMLS_CC, "i|z",
  &what, &value) == FAILURE) {
  WRONG_PARAM_COUNT;
  }

• convert_to_long_ex(what);

• switch (Z_LVAL_PP(what)) {

• switch (what) {
  case ASSERT_ACTIVE:
  oldint = ASSERTG(active);
  if (ac == 2) {

•   	convert_to_long_ex(value);
  

•   	ASSERTG(active) = Z_LVAL_PP(value);
  

•   	convert_to_long_ex(&value);
  

•   	ASSERTG(active) = Z_LVAL_PP(&value);
    }
    RETURN_LONG(oldint);
    break;
  

@@ -262,8 +261,8 @@
case ASSERT_BAIL:
oldint = ASSERTG(bail);
if (ac == 2) {

•   	convert_to_long_ex(value);
  

•   	ASSERTG(bail) = Z_LVAL_PP(value);
  

•   	convert_to_long_ex(&value);
  

•   	ASSERTG(bail) = Z_LVAL_PP(&value);
    }
    RETURN_LONG(oldint);
    break;
  

@@ -271,8 +270,8 @@
case ASSERT_QUIET_EVAL:
oldint = ASSERTG(quiet_eval);
if (ac == 2) {

•   	convert_to_long_ex(value);
  

•   	ASSERTG(quiet_eval) = Z_LVAL_PP(value);
  

•   	convert_to_long_ex(&value);
  

•   	ASSERTG(quiet_eval) = Z_LVAL_PP(&value);
    }
    RETURN_LONG(oldint);
    break;
  

@@ -280,8 +279,8 @@
case ASSERT_WARNING:
oldint = ASSERTG(warning);
if (ac == 2) {

•   	convert_to_long_ex(value);
  

•   	ASSERTG(warning) = Z_LVAL_PP(value);
  

•   	convert_to_long_ex(&value);
  

•   	ASSERTG(warning) = Z_LVAL_PP(&value);
    }
    RETURN_LONG(oldint);
    break;
  

@@ -298,14 +297,14 @@
if (ASSERTG(callback)) {
zval_ptr_dtor(&ASSERTG(callback));
}

•   	ASSERTG(callback) = *value;
  

•   	zval_add_ref(value);
  

•   	ASSERTG(callback) = value;
  

•   	zval_add_ref(&value);
    }
    return;
    break;
  

  default:

•   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown value %ld",  
  

Z_LVAL_PP(what));

•   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown value %ld",  
  

what);
break;
}

Index: formatted_print.c

RCS file: /repository/php-src/ext/standard/formatted_print.c,v
retrieving revision 1.82.2.1.2.16.2.6
diff -u -r1.82.2.1.2.16.2.6 formatted_print.c
--- formatted_print.c 25 Jun 2008 10:16:52 -0000 1.82.2.1.2.16.2.6
+++ formatted_print.c 28 Jun 2008 03:34:12 -0000
@@ -731,19 +731,19 @@
PHP_FUNCTION(fprintf)
{
php_stream *stream;

• zval **arg1;

• zval *arg1;
  char *result;
  int len;

  if (ZEND_NUM_ARGS() < 2) {
  WRONG_PARAM_COUNT;
  }

• if (zend_get_parameters_ex(1, &arg1)==FAILURE) {

• if (zend_parse_parameters(1 TSRMLS_CC, "z", &arg1) ==FAILURE){
  RETURN_FALSE;
  }

• php_stream_from_zval(stream, arg1);

• php_stream_from_zval(stream, &arg1);

  if ((result=php_formatted_print(ht, &len, 0, 1 TSRMLS_CC))==NULL) {
  RETURN_FALSE;
  @@ -762,19 +762,20 @@
  PHP_FUNCTION(vfprintf)
  {
  php_stream *stream;

• zval **arg1;

• zval *arg1;
  char *result;
  int len;

  if (ZEND_NUM_ARGS() != 3) {
  WRONG_PARAM_COUNT;
  }

• if (zend_get_parameters_ex(1, &arg1)==FAILURE) {

• if (zend_parse_parameters(1 TSRMLS_CC, "z", &arg1) ==FAILURE){
  RETURN_FALSE;
  }

• php_stream_from_zval(stream, arg1);

• php_stream_from_zval(stream, &arg1);

  if ((result=php_formatted_print(ht, &len, 1, 1 TSRMLS_CC))==NULL) {
  RETURN_FALSE;