diff options
| author | Thies C. Arntzen <thies@php.net> | 1999-10-12 14:53:15 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 1999-10-12 14:53:15 +0000 |
| commit | 86bb3fa0c0ca46f4c2c2c69d0e66b3f9de1b1e99 (patch) | |
| tree | 5b4b53de949e493a35626e77d69ff1fb8d226130 /ext/sybase_ct | |
| parent | 6d7c18c1f511b3d2e8ba5dc50d919ea352bef3ad (diff) | |
| download | php-git-86bb3fa0c0ca46f4c2c2c69d0e66b3f9de1b1e99.tar.gz | |
new improved resource-API (i hope everything still compiles)
Diffstat (limited to 'ext/sybase_ct')
| -rw-r--r-- | ext/sybase_ct/php_sybase_ct.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c index abba3e3d20..96d903680f 100644 --- a/ext/sybase_ct/php_sybase_ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -642,10 +642,10 @@ PHP_FUNCTION(sybase_close) break; } - 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); + ZEND_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id, "Sybase-Link", sybase_globals.le_link, sybase_globals.le_plink); + + zend_list_delete(id); /* XXX this IS A BUG!!!! */ RETURN_TRUE; } @@ -752,8 +752,7 @@ PHP_FUNCTION(sybase_select_db) break; } - 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_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id, "Sybase-Link", sybase_globals.le_link, sybase_globals.le_plink); convert_to_string(db); cmdbuf = (char *) emalloc(sizeof("use ")+db->value.str.len+1); @@ -964,8 +963,7 @@ PHP_FUNCTION(sybase_query) break; } - 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_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id, "Sybase-Link", sybase_globals.le_link, sybase_globals.le_plink); convert_to_string(query); @@ -1502,8 +1500,7 @@ PHP_FUNCTION(sybase_affected_rows) - 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_FETCH_RESOURCE2(sybase_ptr, sybase_link *, &sybase_link_index, id, "Sybase-Link", sybase_globals.le_link, sybase_globals.le_plink); return_value->value.lval = sybase_ptr->affected_rows; return_value->type = IS_LONG; |