cvs: /php4/ext/sybase_ct php_sybase_ct.c

zeev Fri Sep 24 10:11:54 1999 EDT Modified files: /php4/ext/sybase_ct php_sybase_ct.c Log: This should make the Sybase CT module compile again (untested) Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.3 php4/ext/sybase_ct/php_sybase_ct.c:1.4 --- php4/ext/sybase_ct/php_sybase_ct.c:1.3 Sat Sep 4 09:18:56 1999 +++ php4/ext/sybase_ct/php_sybase_ct.c Fri Sep 24 10:11:53 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.3 1999/09/04 13:18:56 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.4 1999/09/24 14:11:53 zeev Exp $ */ #include "php.h" @@ -642,7 +642,7 @@ break; } - sybase_ptr = (sybase_link *) zend_fetch_resource_ex(sybase_link_index, id, "Sybase link", 2, sybase_globals.le_link, sybase_globals.le_plink); + sybase_ptr = (sybase_link *) zend_fetch_resource_ex(&sybase_link_index, id, "Sybase link", 2, sybase_globals.le_link, sybase_globals.le_plink); ZEND_VERIFY_RESOURCE(sybase_ptr); zend_list_delete(id); @@ -752,7 +752,7 @@ break; } - sybase_ptr = (sybase_link *) zend_fetch_resource_ex(sybase_link_index, id, "Sybase link", 2, sybase_globals.le_link, sybase_globals.le_plink); + sybase_ptr = (sybase_link *) zend_fetch_resource_ex(&sybase_link_index, id, "Sybase link", 2, sybase_globals.le_link, sybase_globals.le_plink); ZEND_VERIFY_RESOURCE(sybase_ptr); convert_to_string(db); @@ -964,7 +964,7 @@ break; } - sybase_ptr = (sybase_link *) zend_fetch_resource_ex(sybase_link_index, id, "Sybase link", 2, sybase_globals.le_link, sybase_globals.le_plink); + sybase_ptr = (sybase_link *) zend_fetch_resource_ex(&sybase_link_index, id, "Sybase link", 2, sybase_globals.le_link, sybase_globals.le_plink); ZEND_VERIFY_RESOURCE(sybase_ptr); convert_to_string(query); @@ -1155,7 +1155,7 @@ RETURN_FALSE; } - ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", sybase_globals.le_result); + ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", sybase_globals.le_result); zend_list_delete(sybase_result_index->value.lval); RETURN_TRUE; @@ -1181,7 +1181,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", sybase_globals.le_result); + ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", sybase_globals.le_result); return_value->value.lval = result->num_rows; return_value->type = IS_LONG; @@ -1197,7 +1197,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", sybase_globals.le_result); + ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", sybase_globals.le_result); return_value->value.lval = result->num_fields; return_value->type = IS_LONG; @@ -1215,7 +1215,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", sybase_globals.le_result); + ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", sybase_globals.le_result); if (result->cur_row >= result->num_rows) { RETURN_FALSE; @@ -1245,7 +1245,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", sybase_globals.le_result); + ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", sybase_globals.le_result); if (result->cur_row >= result->num_rows) { RETURN_FALSE; @@ -1296,7 +1296,7 @@ } - ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", sybase_globals.le_result); + ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", sybase_globals.le_result); convert_to_long(offset); if (offset->value.lval<0 || offset->value.lval>=result->num_rows) { @@ -1378,7 +1378,7 @@ break; } - ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", sybase_globals.le_result); + ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", sybase_globals.le_result); if (field_offset==-1) { field_offset = result->cur_field; @@ -1413,7 +1413,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", sybase_globals.le_result); + ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", sybase_globals.le_result); convert_to_long(offset); field_offset = offset->value.lval; @@ -1440,7 +1440,7 @@ } - ZEND_FETCH_RESOURCE(result, sybase_result *, sybase_result_index, -1, "Sybase result", sybase_globals.le_result); + ZEND_FETCH_RESOURCE(result, sybase_result *, &sybase_result_index, -1, "Sybase result", sybase_globals.le_result); convert_to_long(row); if (row->value.lval<0 || row->value.lval>=result->num_rows) { @@ -1502,7 +1502,7 @@ - sybase_ptr = (sybase_link *) zend_fetch_resource_ex(sybase_link_index, id, "Sybase link", 2, sybase_globals.le_link, sybase_globals.le_plink); + sybase_ptr = (sybase_link *) zend_fetch_resource_ex(&sybase_link_index, id, "Sybase link", 2, sybase_globals.le_link, sybase_globals.le_plink); ZEND_VERIFY_RESOURCE(sybase_ptr); return_value->value.lval = sybase_ptr->affected_rows;