sniper Thu Aug 28 12:31:52 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
sync with HEAD
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.6
php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.7
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.6 Thu Aug 28 12:28:27 2003
+++ php-src/ext/sybase_ct/php_sybase_ct.c Thu Aug 28 12:31:51 2003
@@ -4,10 +4,10 @@
+----------------------------------------------------------------------+
| Copyright (c) 1997-2003 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 2.02 of the PHP license, |
+ | This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_02.txt. |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_0.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.73.2.6 2003/08/28 16:28:27 sniper Exp $ */
+/* $Id: php_sybase_ct.c,v 1.73.2.7 2003/08/28 16:31:51 sniper Exp $ */
#ifdef HAVE_CONFIG_H
@@ -505,92 +505,92 @@
strcpy(hashed_details, "sybase_____");
break;
case 1: {
- zval *yyhost;
+ zval **yyhost;
- if (getParameters(ht, 1, &yyhost)==FAILURE) {
+ if (zend_get_parameters_ex(1, &yyhost) == FAILURE) {
RETURN_FALSE;
}
- convert_to_string(yyhost);
- host = Z_STRVAL_P(yyhost);
+ convert_to_string_ex(yyhost);
+ host = Z_STRVAL_PP(yyhost);
user=passwd=charset=appname=NULL;
- hashed_details_length = Z_STRLEN_P(yyhost)+6+5;
+ hashed_details_length = Z_STRLEN_PP(yyhost)+6+5;
hashed_details = (char *)
emalloc(hashed_details_length+1);
- sprintf(hashed_details, "sybase_%s____",
Z_STRVAL_P(yyhost));
+ sprintf(hashed_details, "sybase_%s____",
Z_STRVAL_PP(yyhost));
}
break;
case 2: {
- zval *yyhost, *yyuser;
+ zval **yyhost, **yyuser;
- if (getParameters(ht, 2, &yyhost, &yyuser)==FAILURE) {
+ if (zend_get_parameters_ex(2, &yyhost, &yyuser) ==
FAILURE) {
RETURN_FALSE;
}
- convert_to_string(yyhost);
- convert_to_string(yyuser);
- host = Z_STRVAL_P(yyhost);
- user = Z_STRVAL_P(yyuser);
+ convert_to_string_ex(yyhost);
+ convert_to_string_ex(yyuser);
+ host = Z_STRVAL_PP(yyhost);
+ user = Z_STRVAL_PP(yyuser);
passwd=charset=appname=NULL;
- hashed_details_length =
Z_STRLEN_P(yyhost)+Z_STRLEN_P(yyuser)+6+5;
+ hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+6+5;
hashed_details = (char *)
emalloc(hashed_details_length+1);
- sprintf(hashed_details, "sybase_%s_%s___",
Z_STRVAL_P(yyhost), Z_STRVAL_P(yyuser));
+ sprintf(hashed_details, "sybase_%s_%s___",
Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser));
}
break;
case 3: {
- zval *yyhost, *yyuser, *yypasswd;
+ zval **yyhost, **yyuser, **yypasswd;
- if (getParameters(ht, 3, &yyhost, &yyuser, &yypasswd)
== FAILURE) {
+ if (zend_get_parameters_ex(3, &yyhost, &yyuser,
&yypasswd) == FAILURE) {
RETURN_FALSE;
}
- convert_to_string(yyhost);
- convert_to_string(yyuser);
- convert_to_string(yypasswd);
- host = Z_STRVAL_P(yyhost);
- user = Z_STRVAL_P(yyuser);
- passwd = Z_STRVAL_P(yypasswd);
+ convert_to_string_ex(yyhost);
+ convert_to_string_ex(yyuser);
+ convert_to_string_ex(yypasswd);
+ host = Z_STRVAL_PP(yyhost);
+ user = Z_STRVAL_PP(yyuser);
+ passwd = Z_STRVAL_PP(yypasswd);
charset=appname=NULL;
- hashed_details_length =
Z_STRLEN_P(yyhost)+Z_STRLEN_P(yyuser)+Z_STRLEN_P(yypasswd)+6+5;
+ hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+6+5;
hashed_details = (char *)
emalloc(hashed_details_length+1);
- sprintf(hashed_details, "sybase_%s_%s_%s__",
Z_STRVAL_P(yyhost), Z_STRVAL_P(yyuser), Z_STRVAL_P(yypasswd));
+ sprintf(hashed_details, "sybase_%s_%s_%s__",
Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd));
}
break;
case 4: {
- zval *yyhost, *yyuser, *yypasswd, *yycharset;
+ zval **yyhost, **yyuser, **yypasswd, **yycharset;
- if (getParameters(ht, 4, &yyhost, &yyuser, &yypasswd,
&yycharset) == FAILURE) {
+ if (zend_get_parameters_ex(4, &yyhost, &yyuser,
&yypasswd, &yycharset) == FAILURE) {
RETURN_FALSE;
}
- convert_to_string(yyhost);
- convert_to_string(yyuser);
- convert_to_string(yypasswd);
- convert_to_string(yycharset);
- host = Z_STRVAL_P(yyhost);
- user = Z_STRVAL_P(yyuser);
- passwd = Z_STRVAL_P(yypasswd);
- charset = Z_STRVAL_P(yycharset);
+ convert_to_string_ex(yyhost);
+ convert_to_string_ex(yyuser);
+ convert_to_string_ex(yypasswd);
+ convert_to_string_ex(yycharset);
+ host = Z_STRVAL_PP(yyhost);
+ user = Z_STRVAL_PP(yyuser);
+ passwd = Z_STRVAL_PP(yypasswd);
+ charset = Z_STRVAL_PP(yycharset);
appname=NULL;
- hashed_details_length =
Z_STRLEN_P(yyhost)+Z_STRLEN_P(yyuser)+Z_STRLEN_P(yypasswd)+Z_STRLEN_P(yycharset)+6+5;
+ hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+Z_STRLEN_PP(yycharset)+6+5;
hashed_details = (char *)
emalloc(hashed_details_length+1);
- sprintf(hashed_details, "sybase_%s_%s_%s_%s_",
Z_STRVAL_P(yyhost), Z_STRVAL_P(yyuser), Z_STRVAL_P(yypasswd), Z_STRVAL_P(yycharset));
+ sprintf(hashed_details, "sybase_%s_%s_%s_%s_",
Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd),
Z_STRVAL_PP(yycharset));
}
break;
case 5: {
- zval *yyhost, *yyuser, *yypasswd, *yycharset,
*yyappname;
+ zval **yyhost, **yyuser, **yypasswd, **yycharset,
**yyappname;
- if (getParameters(ht, 5, &yyhost, &yyuser, &yypasswd,
&yycharset, &yyappname) == FAILURE) {
+ if (zend_get_parameters_ex(5, &yyhost, &yyuser,
&yypasswd, &yycharset, &yyappname) == FAILURE) {
RETURN_FALSE;
}
- convert_to_string(yyhost);
- convert_to_string(yyuser);
- convert_to_string(yypasswd);
- convert_to_string(yycharset);
- convert_to_string(yyappname);
- host = Z_STRVAL_P(yyhost);
- user = Z_STRVAL_P(yyuser);
- passwd = Z_STRVAL_P(yypasswd);
- charset = Z_STRVAL_P(yycharset);
- appname = Z_STRVAL_P(yyappname);
- hashed_details_length =
Z_STRLEN_P(yyhost)+Z_STRLEN_P(yyuser)+Z_STRLEN_P(yypasswd)+Z_STRLEN_P(yycharset)+Z_STRLEN_P(yyappname)+6+5;
+ convert_to_string_ex(yyhost);
+ convert_to_string_ex(yyuser);
+ convert_to_string_ex(yypasswd);
+ convert_to_string_ex(yycharset);
+ convert_to_string_ex(yyappname);
+ host = Z_STRVAL_PP(yyhost);
+ user = Z_STRVAL_PP(yyuser);
+ passwd = Z_STRVAL_PP(yypasswd);
+ charset = Z_STRVAL_PP(yycharset);
+ appname = Z_STRVAL_PP(yyappname);
+ hashed_details_length =
Z_STRLEN_PP(yyhost)+Z_STRLEN_PP(yyuser)+Z_STRLEN_PP(yypasswd)+Z_STRLEN_PP(yycharset)+Z_STRLEN_PP(yyappname)+6+5;
hashed_details = (char *)
emalloc(hashed_details_length+1);
- sprintf(hashed_details, "sybase_%s_%s_%s_%s_%s",
Z_STRVAL_P(yyhost), Z_STRVAL_P(yyuser), Z_STRVAL_P(yypasswd), Z_STRVAL_P(yycharset),
Z_STRVAL_P(yyappname));
+ sprintf(hashed_details, "sybase_%s_%s_%s_%s_%s",
Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd),
Z_STRVAL_PP(yycharset), Z_STRVAL_PP(yyappname));
}
break;
default:
@@ -779,7 +779,7 @@
Close Sybase connection */
PHP_FUNCTION(sybase_close)
{
- zval *sybase_link_index = 0;
+ zval **sybase_link_index = 0;
int id;
sybase_link *sybase_ptr;
@@ -788,7 +788,7 @@
id = SybCtG(default_link);
break;
case 1:
- if (getParameters(ht, 1, &sybase_link_index)==FAILURE) {
+ if (zend_get_parameters_ex(1, &sybase_link_index) == FAILURE) {
RETURN_FALSE;
}
id = -1;
@@ -798,14 +798,13 @@
break;
}
- ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id,
"Sybase-Link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, sybase_link_index, id,
"Sybase-Link", le_link, le_plink);
- if (id==-1) { /* explicit resource number */
- zend_list_delete(Z_RESVAL_P(sybase_link_index));
+ if (id == -1) { /* explicit resource number */
+ zend_list_delete(Z_RESVAL_PP(sybase_link_index));
}
- if (id!=-1
- || (sybase_link_index &&
Z_RESVAL_P(sybase_link_index)==SybCtG(default_link))) {
+ if (id != -1 || (sybase_link_index &&
Z_RESVAL_PP(sybase_link_index)==SybCtG(default_link))) {
zend_list_delete(SybCtG(default_link));
SybCtG(default_link) = -1;
}
@@ -895,21 +894,21 @@
Select Sybase database */
PHP_FUNCTION(sybase_select_db)
{
- zval *db, *sybase_link_index;
+ zval **db, **sybase_link_index;
int id;
char *cmdbuf;
sybase_link *sybase_ptr;
switch(ZEND_NUM_ARGS()) {
case 1:
- if (getParameters(ht, 1, &db)==FAILURE) {
+ if (zend_get_parameters_ex(1, &db) == FAILURE) {
RETURN_FALSE;
}
id =
php_sybase_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
CHECK_LINK(id);
break;
case 2:
- if (getParameters(ht, 2, &db, &sybase_link_index)==FAILURE) {
+ if (zend_get_parameters_ex(2, &db, &sybase_link_index) ==
FAILURE) {
RETURN_FALSE;
}
id = -1;
@@ -919,11 +918,11 @@
break;
}
- ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id,
"Sybase-Link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, sybase_link_index, id,
"Sybase-Link", le_link, le_plink);
- convert_to_string(db);
- cmdbuf = (char *) emalloc(sizeof("use ")+Z_STRLEN_P(db)+1);
- sprintf(cmdbuf, "use %s", Z_STRVAL_P(db)); /* SAFE */
+ convert_to_string_ex(db);
+ cmdbuf = (char *) emalloc(sizeof("use ")+Z_STRLEN_PP(db)+1);
+ sprintf(cmdbuf, "use %s", Z_STRVAL_PP(db)); /* SAFE */
if (exec_cmd(sybase_ptr, cmdbuf)==FAILURE) {
efree(cmdbuf);
@@ -1263,8 +1262,7 @@
if (sybase_ptr->active_result_index) {
zval *tmp = NULL;
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase: Called %s()
without first fetching all rows from a previous unbuffered query",
- get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "called without first
fetching all rows from a previous unbuffered query");
if (sybase_ptr->cmd) {
ct_cancel(NULL, sybase_ptr->cmd, CS_CANCEL_ALL);
}
@@ -1334,7 +1332,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Cannot
read results");
RETURN_FALSE;
}
-
+
switch ((int) restype) {
case CS_CMD_FAIL:
default:
@@ -1478,7 +1476,7 @@
}
/* Indicate we have data in case of buffered queries */
- id = ZEND_REGISTER_RESOURCE(return_value, result, le_result);
+ id= ZEND_REGISTER_RESOURCE(return_value, result, le_result);
sybase_ptr->active_result_index= buffered ? id : 0;
}
@@ -1502,19 +1500,18 @@
Free result memory */
PHP_FUNCTION(sybase_free_result)
{
- zval *sybase_result_index;
+ zval **sybase_result_index;
sybase_result *result;
- if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE)
{
+ if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
- if (Z_TYPE_P(sybase_result_index)==IS_RESOURCE
- && Z_LVAL_P(sybase_result_index)==0) {
+ if (Z_TYPE_PP(sybase_result_index) == IS_RESOURCE &&
Z_LVAL_PP(sybase_result_index) == 0) {
RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase
result", le_result);
+ ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase
result", le_result);
/* Did we fetch up until the end? */
if (result->last_retcode != CS_END_DATA) {
@@ -1523,7 +1520,7 @@
php_sybase_finish_results(result);
}
- zend_list_delete(Z_LVAL_P(sybase_result_index));
+ zend_list_delete(Z_LVAL_PP(sybase_result_index));
RETURN_TRUE;
}
@@ -1541,14 +1538,14 @@
Get number of rows in result */
PHP_FUNCTION(sybase_num_rows)
{
- zval *sybase_result_index;
+ zval **sybase_result_index;
sybase_result *result;
- if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE)
{
+ if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
- ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase
result", le_result);
+ ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase
result", le_result);
Z_LVAL_P(return_value) = result->num_rows;
Z_TYPE_P(return_value) = IS_LONG;
@@ -1560,14 +1557,14 @@
Get number of fields in result */
PHP_FUNCTION(sybase_num_fields)
{
- zval *sybase_result_index;
+ zval **sybase_result_index;
sybase_result *result;
- if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE)
{
+ if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
- ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase
result", le_result);
+ ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase
result", le_result);
Z_LVAL_P(return_value) = result->num_fields;
Z_TYPE_P(return_value) = IS_LONG;
@@ -1579,16 +1576,16 @@
Get row as enumerated array */
PHP_FUNCTION(sybase_fetch_row)
{
- zval *sybase_result_index;
+ zval **sybase_result_index;
int i;
sybase_result *result;
zval *field_content;
- if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE)
{
+ if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
- ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase
result", le_result);
+ ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase
result", le_result);
/* Unbuffered? */
if (result->last_retcode != CS_END_DATA) {
@@ -1615,17 +1612,17 @@
static void php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int numerics)
{
- zval *sybase_result_index;
+ zval **sybase_result_index;
sybase_result *result;
int i, j;
zval *tmp;
char name[32];
- if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &sybase_result_index)==FAILURE)
{
+ if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) ==
FAILURE) {
WRONG_PARAM_COUNT;
}
- ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase
result", le_result);
+ ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase
result", le_result);
/* Unbuffered ? Fetch next row */
if (result->last_retcode != CS_END_DATA) {
@@ -1637,9 +1634,7 @@
RETURN_FALSE;
}
- if (array_init(return_value)==FAILURE) {
- RETURN_FALSE;
- }
+ array_init(return_value);
j= 1;
for (i=0; i<result->num_fields; i++) {
@@ -1730,29 +1725,29 @@
Move internal row pointer */
PHP_FUNCTION(sybase_data_seek)
{
- zval *sybase_result_index, *offset;
+ zval **sybase_result_index, **offset;
sybase_result *result;
- if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &sybase_result_index,
&offset)==FAILURE) {
+ if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &sybase_result_index,
&offset)==FAILURE) {
WRONG_PARAM_COUNT;
}
- ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase
result", le_result);
+ ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase
result", le_result);
- convert_to_long(offset);
+ convert_to_long_ex(offset);
/* Unbuffered ? */
- if (result->last_retcode != CS_END_DATA && Z_LVAL_P(offset)>=result->num_rows)
{
- php_sybase_fetch_result_row(result, Z_LVAL_P(offset));
+ if (result->last_retcode != CS_END_DATA &&
Z_LVAL_PP(offset)>=result->num_rows) {
+ php_sybase_fetch_result_row(result, Z_LVAL_PP(offset));
}
- if (Z_LVAL_P(offset)<0 || Z_LVAL_P(offset)>=result->num_rows) {
+ if (Z_LVAL_PP(offset)<0 || Z_LVAL_PP(offset)>=result->num_rows) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Bad row offset");
RETURN_FALSE;
}
- result->cur_row = Z_LVAL_P(offset);
+ result->cur_row = Z_LVAL_PP(offset);
RETURN_TRUE;
}
/* }}} */
@@ -1805,30 +1800,30 @@
Get field information */
PHP_FUNCTION(sybase_fetch_field)
{
- zval *sybase_result_index, *offset;
+ zval **sybase_result_index, **offset;
int field_offset;
sybase_result *result;
switch (ZEND_NUM_ARGS()) {
case 1:
- if (getParameters(ht, 1, &sybase_result_index)==FAILURE) {
+ if (zend_get_parameters_ex(1, &sybase_result_index) ==
FAILURE) {
RETURN_FALSE;
}
field_offset=-1;
break;
case 2:
- if (getParameters(ht, 2, &sybase_result_index,
&offset)==FAILURE) {
+ if (zend_get_parameters_ex(2, &sybase_result_index, &offset)
== FAILURE) {
RETURN_FALSE;
}
- convert_to_long(offset);
- field_offset = Z_LVAL_P(offset);
+ convert_to_long_ex(offset);
+ field_offset = Z_LVAL_PP(offset);
break;
default:
WRONG_PARAM_COUNT;
break;
}
- ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase
result", le_result);
+ ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase
result", le_result);
if (field_offset==-1) {
field_offset = result->cur_field;
@@ -1842,9 +1837,8 @@
RETURN_FALSE;
}
- if (object_init(return_value)==FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
+
add_property_string(return_value, "name", result->fields[field_offset].name,
1);
add_property_long(return_value, "max_length",
result->fields[field_offset].max_length);
add_property_string(return_value, "column_source",
result->fields[field_offset].column_source, 1);
@@ -1858,18 +1852,18 @@
Set field offset */
PHP_FUNCTION(sybase_field_seek)
{
- zval *sybase_result_index, *offset;
+ zval **sybase_result_index, **offset;
int field_offset;
sybase_result *result;
- if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &sybase_result_index,
&offset)==FAILURE) {
+ if (ZEND_NUM_ARGS() !=2 || zend_get_parameters_ex(2, &sybase_result_index,
&offset) == FAILURE) {
WRONG_PARAM_COUNT;
}
- ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase
result", le_result);
+ ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase
result", le_result);
- convert_to_long(offset);
- field_offset = Z_LVAL_P(offset);
+ convert_to_long_ex(offset);
+ field_offset = Z_LVAL_PP(offset);
/* Unbuffered ? */
if (result->last_retcode != CS_END_DATA && field_offset>=result->num_rows) {
@@ -1891,48 +1885,48 @@
Get result data */
PHP_FUNCTION(sybase_result)
{
- zval *row, *field, *sybase_result_index;
+ zval **row, **field, **sybase_result_index;
int field_offset=0;
sybase_result *result;
- if (ZEND_NUM_ARGS()!=3 || getParameters(ht, 3, &sybase_result_index, &row,
&field)==FAILURE) {
+ if (ZEND_NUM_ARGS() !=3 || zend_get_parameters_ex(3, &sybase_result_index,
&row, &field)==FAILURE) {
WRONG_PARAM_COUNT;
}
- ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase
result", le_result);
+ ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase
result", le_result);
- convert_to_long(row);
+ convert_to_long_ex(row);
/* Unbuffered ? */
- if (result->last_retcode != CS_END_DATA && Z_LVAL_P(row)>=result->num_rows) {
- php_sybase_fetch_result_row(result, Z_LVAL_P(row));
+ if (result->last_retcode != CS_END_DATA && Z_LVAL_PP(row) >= result->num_rows)
{
+ php_sybase_fetch_result_row(result, Z_LVAL_PP(row));
}
- if (Z_LVAL_P(row)<0 || Z_LVAL_P(row)>=result->num_rows) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Bad row offset
(%d)", Z_LVAL_P(row));
+ if (Z_LVAL_PP(row) < 0 || Z_LVAL_PP(row) >= result->num_rows) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Bad row offset
(%d)", Z_LVAL_PP(row));
RETURN_FALSE;
}
- switch(Z_TYPE_P(field)) {
+ switch(Z_TYPE_PP(field)) {
case IS_STRING: {
int i;
for (i=0; i<result->num_fields; i++) {
- if (!strcasecmp(result->fields[i].name,
Z_STRVAL_P(field))) {
+ if (!strcasecmp(result->fields[i].name,
Z_STRVAL_PP(field))) {
field_offset = i;
break;
}
}
if (i>=result->num_fields) { /* no match found */
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:
%s field not found in result", Z_STRVAL_P(field));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:
%s field not found in result", Z_STRVAL_PP(field));
RETURN_FALSE;
}
break;
}
default:
- convert_to_long(field);
- field_offset = Z_LVAL_P(field);
+ convert_to_long_ex(field);
+ field_offset = Z_LVAL_PP(field);
if (field_offset<0 || field_offset>=result->num_fields) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:
Bad column offset specified");
RETURN_FALSE;
@@ -1940,7 +1934,7 @@
break;
}
- *return_value = result->data[Z_LVAL_P(row)][field_offset];
+ *return_value = result->data[Z_LVAL_PP(row)][field_offset];
zval_copy_ctor(return_value);
}
/* }}} */
@@ -1950,7 +1944,7 @@
Get number of affected rows in last query */
PHP_FUNCTION(sybase_affected_rows)
{
- zval *sybase_link_index;
+ zval **sybase_link_index;
sybase_link *sybase_ptr;
int id;
@@ -1959,7 +1953,7 @@
id =
php_sybase_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
break;
case 1:
- if (getParameters(ht, 1, &sybase_link_index)==FAILURE) {
+ if (zend_get_parameters_ex(1, &sybase_link_index) == FAILURE) {
RETURN_FALSE;
}
id = -1;
@@ -1969,7 +1963,7 @@
break;
}
- ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id,
"Sybase-Link", le_link, le_plink);
+ ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, sybase_link_index, id,
"Sybase-Link", le_link, le_plink);
Z_LVAL_P(return_value) = sybase_ptr->affected_rows;
Z_TYPE_P(return_value) = IS_LONG;
@@ -2004,13 +1998,13 @@
Sets minimum client severity */
PHP_FUNCTION(sybase_min_client_severity)
{
- zval *severity;
+ zval **severity;
- if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &severity)==FAILURE) {
+ if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &severity) == FAILURE) {
WRONG_PARAM_COUNT;
}
- convert_to_long(severity);
- SybCtG(min_client_severity) = Z_LVAL_P(severity);
+ convert_to_long_ex(severity);
+ SybCtG(min_client_severity) = Z_LVAL_PP(severity);
}
/* }}} */
@@ -2019,13 +2013,13 @@
Sets minimum server severity */
PHP_FUNCTION(sybase_min_server_severity)
{
- zval *severity;
+ zval **severity;
- if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &severity)==FAILURE) {
+ if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &severity) == FAILURE) {
WRONG_PARAM_COUNT;
}
- convert_to_long(severity);
- SybCtG(min_server_severity) = Z_LVAL_P(severity);
+ convert_to_long_ex(severity);
+ SybCtG(min_server_severity) = Z_LVAL_PP(severity);
}
/* }}} */
@@ -2033,13 +2027,13 @@
Sets deadlock retry count */
PHP_FUNCTION(sybase_deadlock_retry_count)
{
- zval *retry_count;
+ zval **retry_count;
- if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &retry_count)==FAILURE) {
+ if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &retry_count) == FAILURE)
{
WRONG_PARAM_COUNT;
}
- convert_to_long(retry_count);
- SybCtG(deadlock_retry_count) = Z_LVAL_P(retry_count);
+ convert_to_long_ex(retry_count);
+ SybCtG(deadlock_retry_count) = Z_LVAL_PP(retry_count);
}
/* }}} */
@@ -2075,7 +2069,7 @@
}
if (!zend_is_callable(*params[0], 0, &name)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s(): First argumented is
expected to be a valid callback, '%s' was given", get_active_function_name(TSRMLS_C),
name);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "First argumented is
expected to be a valid callback, '%s' was given", name);
efree(name);
efree(params);
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
