iliaa Wed Jan 15 08:55:33 2003 EDT
Modified files:
/php4/ext/sybase php_sybase_db.c
/php4/ext/sybase_ct php_sybase_ct.c
Log:
Various corrections.
Index: php4/ext/sybase/php_sybase_db.c
diff -u php4/ext/sybase/php_sybase_db.c:1.44 php4/ext/sybase/php_sybase_db.c:1.45
--- php4/ext/sybase/php_sybase_db.c:1.44 Tue Jan 14 22:01:12 2003
+++ php4/ext/sybase/php_sybase_db.c Wed Jan 15 08:55:32 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.c,v 1.44 2003/01/15 03:01:12 iliaa Exp $ */
+/* $Id: php_sybase_db.c,v 1.45 2003/01/15 13:55:32 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -770,7 +770,7 @@
Send Sybase query */
PHP_FUNCTION(sybase_query)
{
- pval *query,*sybase_link_index;
+ zval **query, **sybase_link_index;
int id,type,retvalue;
sybase_link *sybase_ptr;
sybase_result *result;
Index: php4/ext/sybase_ct/php_sybase_ct.c
diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.78 php4/ext/sybase_ct/php_sybase_ct.c:1.79
--- php4/ext/sybase_ct/php_sybase_ct.c:1.78 Tue Jan 14 22:01:14 2003
+++ php4/ext/sybase_ct/php_sybase_ct.c Wed Jan 15 08:55:32 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.78 2003/01/15 03:01:14 iliaa Exp $ */
+/* $Id: php_sybase_ct.c,v 1.79 2003/01/15 13:55:32 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -798,10 +798,10 @@
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));
+ zend_list_delete(Z_RESVAL_PP(sybase_link_index));
}
if (id != -1 || (sybase_link_index &&
Z_RESVAL_PP(sybase_link_index)==SybCtG(default_link))) {
@@ -1721,7 +1721,7 @@
}
- 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_ex(offset);
@@ -1788,7 +1788,7 @@
Get field information */
PHP_FUNCTION(sybase_fetch_field)
{
- zval *sybase_result_index, *offset;
+ zval **sybase_result_index, **offset;
int field_offset;
sybase_result *result;
@@ -1811,7 +1811,7 @@
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;
@@ -1849,7 +1849,7 @@
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_ex(offset);
field_offset = Z_LVAL_PP(offset);
@@ -1883,7 +1883,7 @@
}
- 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_ex(row);
@@ -1952,7 +1952,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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
