tony2001 Thu Aug 31 16:14:43 2006 UTC
Modified files:
/php-src/ext/imap php_imap.c
/php-src/ext/oci8 oci8_statement.c
/php-src/ext/posix posix.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/sockets sockets.c
Log:
last portion of z/Z fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.220&r2=1.221&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.220 php-src/ext/imap/php_imap.c:1.221
--- php-src/ext/imap/php_imap.c:1.220 Fri Aug 11 18:06:28 2006
+++ php-src/ext/imap/php_imap.c Thu Aug 31 16:14:43 2006
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.220 2006/08/11 18:06:28 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.221 2006/08/31 16:14:43 tony2001 Exp $ */
#define IMAP41
@@ -1872,14 +1872,14 @@
Save a specific body section to a file */
PHP_FUNCTION(imap_savebody)
{
- zval *stream, *out;
+ zval *stream, **out;
pils *imap_ptr = NULL;
php_stream *writer = NULL;
char *section = "";
int section_len = 0, close_stream = 1;
long msgno, flags = 0;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"rzl|sl", &stream, &out, &msgno, §ion, §ion_len, &flags)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"rZl|sl", &stream, &out, &msgno, §ion, §ion_len, &flags)) {
RETURN_FALSE;
}
@@ -1889,17 +1889,17 @@
RETURN_FALSE;
}
- switch (Z_TYPE_P(out))
+ switch (Z_TYPE_PP(out))
{
case IS_LONG:
case IS_RESOURCE:
close_stream = 0;
- php_stream_from_zval(writer, &out);
+ php_stream_from_zval(writer, out);
break;
default:
- convert_to_string_ex(&out);
- writer = php_stream_open_wrapper(Z_STRVAL_P(out), "wb",
REPORT_ERRORS, NULL);
+ convert_to_string_ex(out);
+ writer = php_stream_open_wrapper(Z_STRVAL_PP(out),
"wb", REPORT_ERRORS, NULL);
break;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.27&r2=1.28&diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.27
php-src/ext/oci8/oci8_statement.c:1.28
--- php-src/ext/oci8/oci8_statement.c:1.27 Tue Aug 22 11:08:28 2006
+++ php-src/ext/oci8/oci8_statement.c Thu Aug 31 16:14:43 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_statement.c,v 1.27 2006/08/22 11:08:28 tony2001 Exp $ */
+/* $Id: oci8_statement.c,v 1.28 2006/08/31 16:14:43 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
@@ -1079,11 +1079,11 @@
Helper function to get column by name and index */
php_oci_out_column
*php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAMETERS, int
need_data)
{
- zval *z_statement, *column_index;
+ zval *z_statement, **column_index;
php_oci_statement *statement;
php_oci_out_column *column;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz",
&z_statement, &column_index) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZ",
&z_statement, &column_index) == FAILURE) {
return NULL;
}
@@ -1097,17 +1097,17 @@
return NULL;
}
- if (Z_TYPE_P(column_index) == IS_STRING) {
- column = php_oci_statement_get_column(statement, -1,
Z_STRVAL_P(column_index), Z_STRLEN_P(column_index) TSRMLS_CC);
+ if (Z_TYPE_PP(column_index) == IS_STRING) {
+ column = php_oci_statement_get_column(statement, -1,
Z_STRVAL_PP(column_index), Z_STRLEN_PP(column_index) TSRMLS_CC);
if (!column) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
column name \"%s\"", Z_STRVAL_P(column_index));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
column name \"%s\"", Z_STRVAL_PP(column_index));
return NULL;
}
} else {
- convert_to_long(column_index);
- column = php_oci_statement_get_column(statement,
Z_LVAL_P(column_index), NULL, 0 TSRMLS_CC);
+ convert_to_long_ex(column_index);
+ column = php_oci_statement_get_column(statement,
Z_LVAL_PP(column_index), NULL, 0 TSRMLS_CC);
if (!column) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
column index \"%ld\"", Z_LVAL_P(column_index));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
column index \"%ld\"", Z_LVAL_PP(column_index));
return NULL;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.77&r2=1.78&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.77 php-src/ext/posix/posix.c:1.78
--- php-src/ext/posix/posix.c:1.77 Mon Jun 19 23:55:11 2006
+++ php-src/ext/posix/posix.c Thu Aug 31 16:14:43 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.77 2006/06/19 23:55:11 iliaa Exp $ */
+/* $Id: posix.c,v 1.78 2006/08/31 16:14:43 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.77 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.78 $");
php_info_print_table_end();
}
/* }}} */
@@ -552,23 +552,23 @@
Determine terminal device name (POSIX.1, 4.7.2) */
PHP_FUNCTION(posix_ttyname)
{
- zval *z_fd;
+ zval **z_fd;
char *p;
int fd;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_fd) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &z_fd) ==
FAILURE) {
RETURN_FALSE;
}
- switch (Z_TYPE_P(z_fd)) {
+ switch (Z_TYPE_PP(z_fd)) {
case IS_RESOURCE:
- if (!php_posix_stream_get_fd(z_fd, &fd TSRMLS_CC)) {
+ if (!php_posix_stream_get_fd(*z_fd, &fd TSRMLS_CC)) {
RETURN_FALSE;
}
break;
default:
- convert_to_long(z_fd);
- fd = Z_LVAL_P(z_fd);
+ convert_to_long_ex(z_fd);
+ fd = Z_LVAL_PP(z_fd);
}
if (NULL == (p = ttyname(fd))) {
@@ -584,22 +584,22 @@
Determine if filedesc is a tty (POSIX.1, 4.7.1) */
PHP_FUNCTION(posix_isatty)
{
- zval *z_fd;
+ zval **z_fd;
int fd;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_fd) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &z_fd) ==
FAILURE) {
RETURN_FALSE;
}
- switch (Z_TYPE_P(z_fd)) {
+ switch (Z_TYPE_PP(z_fd)) {
case IS_RESOURCE:
- if (!php_posix_stream_get_fd(z_fd, &fd TSRMLS_CC)) {
+ if (!php_posix_stream_get_fd(*z_fd, &fd TSRMLS_CC)) {
RETURN_FALSE;
}
break;
default:
- convert_to_long(z_fd);
- fd = Z_LVAL_P(z_fd);
+ convert_to_long_ex(z_fd);
+ fd = Z_LVAL_PP(z_fd);
}
if (isatty(fd)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.250&r2=1.251&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.250
php-src/ext/reflection/php_reflection.c:1.251
--- php-src/ext/reflection/php_reflection.c:1.250 Wed Aug 30 10:41:43 2006
+++ php-src/ext/reflection/php_reflection.c Thu Aug 31 16:14:43 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.250 2006/08/30 10:41:43 tony2001 Exp $ */
+/* $Id: php_reflection.c,v 1.251 2006/08/31 16:14:43 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1774,7 +1774,7 @@
ZEND_METHOD(reflection_parameter, __construct)
{
parameter_reference *ref;
- zval *reference, *parameter;
+ zval *reference, **parameter;
zval *object;
zval *name;
reflection_object *intern;
@@ -1783,7 +1783,7 @@
int position;
zend_class_entry *ce = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &reference,
¶meter) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zZ", &reference,
¶meter) == FAILURE) {
return;
}
@@ -1800,7 +1800,6 @@
unsigned int lcname_len;
zstr lcname;
- convert_to_text_ex(&reference);
lcname =
zend_u_str_case_fold(Z_TYPE_P(reference), Z_UNIVAL_P(reference),
Z_UNILEN_P(reference), 1, &lcname_len);
if (zend_u_hash_find(EG(function_table),
Z_TYPE_P(reference), lcname, lcname_len + 1, (void**) &fptr) == FAILURE) {
efree(lcname.v);
@@ -1857,8 +1856,8 @@
/* Now, search for the parameter */
arg_info = fptr->common.arg_info;
- if (Z_TYPE_P(parameter) == IS_LONG) {
- position= Z_LVAL_P(parameter);
+ if (Z_TYPE_PP(parameter) == IS_LONG) {
+ position= Z_LVAL_PP(parameter);
if (position < 0 || (zend_uint)position >=
fptr->common.num_args) {
_DO_THROW("The parameter specified by its offset could
not be found");
/* returns out of this function */
@@ -1867,12 +1866,12 @@
zend_uint i;
position= -1;
- convert_to_text_ex(¶meter);
+ convert_to_text_ex(parameter);
for (i = 0; i < fptr->common.num_args; i++) {
- if (Z_TYPE_P(parameter) == IS_STRING &&
arg_info[i].name.s && strcmp(arg_info[i].name.s, Z_STRVAL_P(parameter)) == 0) {
+ if (Z_TYPE_PP(parameter) == IS_STRING &&
arg_info[i].name.s && strcmp(arg_info[i].name.s, Z_STRVAL_PP(parameter)) == 0) {
position= i;
break;
- } else if (Z_TYPE_P(parameter) == IS_UNICODE &&
arg_info[i].name.u && u_strcmp(arg_info[i].name.u, Z_USTRVAL_P(parameter)) ==
0) {
+ } else if (Z_TYPE_PP(parameter) == IS_UNICODE &&
arg_info[i].name.u && u_strcmp(arg_info[i].name.u, Z_USTRVAL_PP(parameter)) ==
0) {
position= i;
break;
}
@@ -4867,7 +4866,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.250
2006/08/30 10:41:43 tony2001 Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.251
2006/08/31 16:14:43 tony2001 Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.181&r2=1.182&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.181 php-src/ext/sockets/sockets.c:1.182
--- php-src/ext/sockets/sockets.c:1.181 Sun Jul 30 11:54:11 2006
+++ php-src/ext/sockets/sockets.c Thu Aug 31 16:14:43 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.181 2006/07/30 11:54:11 tony2001 Exp $ */
+/* $Id: sockets.c,v 1.182 2006/08/31 16:14:43 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1596,7 +1596,7 @@
Sets socket options for the socket */
PHP_FUNCTION(socket_set_option)
{
- zval *arg1, *arg4;
+ zval *arg1, **arg4;
struct linger lv;
struct timeval tv;
php_socket *php_sock;
@@ -1617,7 +1617,7 @@
char *sec_key = "sec";
char *usec_key = "usec";
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllz", &arg1,
&level, &optname, &arg4) == FAILURE)
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllZ", &arg1,
&level, &optname, &arg4) == FAILURE)
return;
ZEND_FETCH_RESOURCE(php_sock, php_socket *, &arg1, -1, le_socket_name,
le_socket);
@@ -1626,8 +1626,8 @@
switch (optname) {
case SO_LINGER:
- convert_to_array_ex(&arg4);
- opt_ht = HASH_OF(arg4);
+ convert_to_array_ex(arg4);
+ opt_ht = HASH_OF(*arg4);
if (zend_hash_find(opt_ht, l_onoff_key,
strlen(l_onoff_key) + 1, (void **)&l_onoff) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "no
key \"%s\" passed in optval", l_onoff_key);
@@ -1649,8 +1649,8 @@
break;
case SO_RCVTIMEO:
case SO_SNDTIMEO:
- convert_to_array_ex(&arg4);
- opt_ht = HASH_OF(arg4);
+ convert_to_array_ex(arg4);
+ opt_ht = HASH_OF(*arg4);
if (zend_hash_find(opt_ht, sec_key, strlen(sec_key) +
1, (void **)&sec) == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "no
key \"%s\" passed in optval", sec_key);
@@ -1675,8 +1675,8 @@
#endif
break;
default:
- convert_to_long_ex(&arg4);
- ov = Z_LVAL_P(arg4);
+ convert_to_long_ex(arg4);
+ ov = Z_LVAL_PP(arg4);
optlen = sizeof(ov);
opt_ptr = &ov;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
