cvs: /php4/ext/msql php_msql.c /php4/ext/mysql php_mysql.c /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.c /php4/ext/oracle oracle.c
/php4/ext/sybase_ct php_sybase_ct.c

thies Tue Oct 12 10:53:12 1999 EDT Modified files: /php4/ext/msql php_msql.c /php4/ext/mysql php_mysql.c /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.c /php4/ext/oracle oracle.c /php4/ext/sybase_ct php_sybase_ct.c Log: new improved resource-API (i hope everything still compiles) Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.4 php4/ext/msql/php_msql.c:1.5 --- php4/ext/msql/php_msql.c:1.4 Fri Sep 24 10:09:35 1999 +++ php4/ext/msql/php_msql.c Tue Oct 12 10:53:05 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.4 1999/09/24 14:09:35 zeev Exp $ */ +/* $Id: php_msql.c,v 1.5 1999/10/12 14:53:05 thies Exp $ */ #include "php.h" #if COMPILE_DL @@ -402,8 +402,7 @@ break; } - msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); - ZEND_VERIFY_RESOURCE(msql); + ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); zend_list_delete(id); RETURN_TRUE; @@ -438,8 +437,7 @@ } - msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); - ZEND_VERIFY_RESOURCE(msql); + ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); convert_to_string(db); @@ -478,8 +476,7 @@ break; } - msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); - ZEND_VERIFY_RESOURCE(msql); + ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); convert_to_string(db); if (msqlCreateDB(msql,db->value.str.val)<0) { @@ -517,8 +514,7 @@ break; } - msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); - ZEND_VERIFY_RESOURCE(msql); + ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); convert_to_string(db); if (msqlDropDB(msql,db->value.str.val)<0) { @@ -557,8 +553,7 @@ break; } - msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); - ZEND_VERIFY_RESOURCE(msql); + ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); convert_to_string(query); if ((af_rows = msqlQuery(msql,query->value.str.val))==-1) { @@ -596,8 +591,7 @@ break; } - msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); - ZEND_VERIFY_RESOURCE(msql); + ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); convert_to_string(db); if (msqlSelectDB(msql,db->value.str.val)==-1) { @@ -637,8 +631,7 @@ break; } - msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); - ZEND_VERIFY_RESOURCE(msql); + ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); if ((msql_result=msqlListDBs(msql))==NULL) { php_error(E_WARNING,"Unable to save mSQL query result"); @@ -676,8 +669,7 @@ break; } - msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); - ZEND_VERIFY_RESOURCE(msql); + ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); convert_to_string(db); if (msqlSelectDB(msql,db->value.str.val)==-1) { @@ -719,8 +711,7 @@ break; } - msql = (int) zend_fetch_resource_ex(&msql_link, id, "mSQL link", 2, msql_globals.le_link, msql_globals.le_plink); - ZEND_VERIFY_RESOURCE(msql); + ZEND_FETCH_RESOURCE2(msql, int, &msql_link, id, "mSQL-Link", msql_globals.le_link, msql_globals.le_plink); convert_to_string(db); if (msqlSelectDB(msql,db->value.str.val)==-1) { Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.5 php4/ext/mysql/php_mysql.c:1.6 --- php4/ext/mysql/php_mysql.c:1.5 Mon Oct 4 11:18:13 1999 +++ php4/ext/mysql/php_mysql.c Tue Oct 12 10:53:06 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.5 1999/10/04 15:18:13 sas Exp $ */ +/* $Id: php_mysql.c,v 1.6 1999/10/12 14:53:06 thies Exp $ */ /* TODO: @@ -642,8 +642,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); zend_list_delete(id); RETURN_TRUE; @@ -680,8 +679,7 @@ } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); convert_to_string_ex(db); @@ -722,8 +720,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); convert_to_string_ex(db); if (mysql_create_db(mysql, (*db)->value.str.val)==0) { @@ -764,8 +761,7 @@ } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); convert_to_string_ex(db); if (mysql_drop_db(mysql, (*db)->value.str.val)==0) { @@ -806,8 +802,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); convert_to_string_ex(query); /* mysql_query binary unsafe, use mysql_real_query */ @@ -862,8 +857,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); convert_to_string_ex(db); if (mysql_select_db(mysql, (*db)->value.str.val)!=0) { @@ -920,8 +914,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); if ((mysql_result=mysql_list_dbs(mysql, NULL))==NULL) { php_error(E_WARNING,"Unable to save MySQL query result"); @@ -961,8 +954,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); convert_to_string_ex(db); if (mysql_select_db(mysql, (*db)->value.str.val)!=0) { @@ -1006,8 +998,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); convert_to_string_ex(db); if (mysql_select_db(mysql, (*db)->value.str.val)!=0) { @@ -1050,8 +1041,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); RETURN_STRING(mysql_error(mysql),1); } @@ -1086,8 +1076,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); RETURN_LONG(mysql_errno(mysql)); } @@ -1120,8 +1109,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); /* conversion from int64 to long happing here */ return_value->value.lval = (long) mysql_affected_rows(mysql); @@ -1155,8 +1143,7 @@ break; } - mysql = (MYSQL *) zend_fetch_resource_ex(mysql_link, id, "MySQL link", 2, le_link, le_plink); - ZEND_VERIFY_RESOURCE(mysql); + ZEND_FETCH_RESOURCE2(mysql, MYSQL *, mysql_link, id, "MySQL-Link", le_link, le_plink); /* conversion from int64 to long happing here */ return_value->value.lval = (long) mysql_insert_id(mysql); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.32 php4/ext/oci8/oci8.c:1.33 --- php4/ext/oci8/oci8.c:1.32 Tue Oct 5 12:06:54 1999 +++ php4/ext/oci8/oci8.c Tue Oct 12 10:53:09 1999 @@ -22,7 +22,7 @@ #define OCI_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.32 1999/10/05 16:06:54 thies Exp $ */ +/* $Id: oci8.c,v 1.33 1999/10/12 14:53:09 thies Exp $ */ /* TODO list: * @@ -727,7 +727,7 @@ { oci_connection *connection; - connection = (oci_connection *) zend_fetch_resource_ex(conn, -1, "OCI8-Connection", 1, le_conn); + connection = (oci_connection *) zend_fetch_resource(conn, -1, "OCI8-Connection", NULL, 1, le_conn); if (connection && connection->open) { return connection; @@ -743,7 +743,7 @@ { oci_statement *statement; - statement = (oci_statement *) zend_fetch_resource_ex(stmt, -1, "OCI8-Connection", 1, le_stmt); + statement = (oci_statement *) zend_fetch_resource(stmt, -1, "OCI8-Connection", NULL, 1, le_stmt); if (statement && statement->conn->open) { return statement; @@ -3233,12 +3233,12 @@ OCILS_FETCH(); if (getParametersEx(1, &arg) == SUCCESS) { - statement = (oci_statement *) zend_fetch_resource_ex(arg, -1, NULL, 1, le_stmt); + statement = (oci_statement *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_stmt); if (statement) { errh = statement->pError; error = statement->error; } else { - connection = (oci_connection *) zend_fetch_resource_ex(arg, -1, NULL, 1, le_conn); + connection = (oci_connection *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_conn); if (connection) { errh = connection->pError; error = connection->error; Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.7 php4/ext/odbc/php_odbc.c:1.8 --- php4/ext/odbc/php_odbc.c:1.7 Fri Oct 8 15:43:27 1999 +++ php4/ext/odbc/php_odbc.c Tue Oct 12 10:53:10 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.7 1999/10/08 19:43:27 kara Exp $ */ +/* $Id: php_odbc.c,v 1.8 1999/10/12 14:53:10 thies Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -560,8 +560,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *) zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); rc = SQLTransact(conn->henv, conn->hdbc, (UWORD)((type)?SQL_COMMIT:SQL_ROLLBACK)); if(rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO){ @@ -620,8 +619,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); convert_to_string_ex(pv_query); query = (*pv_query)->value.str.val; @@ -922,8 +920,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); convert_to_string_ex(pv_query); query = (*pv_query)->value.str.val; @@ -1810,8 +1807,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *) zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); zend_list_delete((*pv_conn)->value.lval); } @@ -2019,8 +2015,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *) zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); if((*pv_onoff)){ convert_to_long_ex(pv_onoff); @@ -2087,9 +2082,7 @@ switch ((*pv_which)->value.lval) { case 1: /* SQLSetConnectOption */ - conn = (odbc_connection *) zend_fetch_resource_ex(pv_handle, -1, "ODBC connection", - 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_handle, -1, "ODBC-Link", le_conn, le_pconn); if(conn->persistent){ php_error(E_WARNING, "Can't set option for persistent connection"); RETURN_FALSE; @@ -2156,8 +2149,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2239,8 +2231,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2318,8 +2309,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2404,8 +2394,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2482,8 +2471,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2556,8 +2544,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2638,8 +2625,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2719,8 +2705,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2804,8 +2789,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2890,8 +2874,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ @@ -2968,8 +2951,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *)zend_fetch_resource_ex(pv_conn, -1, "ODBC connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_conn, le_pconn); result = (odbc_result *)emalloc(sizeof(odbc_result)); if(result == NULL){ Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.26 php4/ext/oracle/oracle.c:1.27 --- php4/ext/oracle/oracle.c:1.26 Tue Oct 5 08:10:51 1999 +++ php4/ext/oracle/oracle.c Tue Oct 12 10:53:11 1999 @@ -577,10 +577,8 @@ if (getParametersEx(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } + ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); - conn = (oraConnection *) zend_fetch_resource_ex(arg, -1, "Oracle-Connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); - zend_list_delete((*arg)->value.lval); } /* }}} */ @@ -597,9 +595,7 @@ if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } - - conn = (oraConnection *) zend_fetch_resource_ex(arg, -1, "Oracle-Connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); if ((cursor = (oraCursor *)emalloc(sizeof(oraCursor))) == NULL){ php_error(E_WARNING, "Out of memory"); @@ -630,12 +626,8 @@ if (getParametersEx(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } + ZEND_FETCH_RESOURCE(cursor, oraCursor *, arg, -1, "Oracle-Cursor", le_cursor); - cursor = (oraCursor *) zend_fetch_resource_ex(arg, -1, "Oracle-Cursor", 1, le_cursor); - if (! cursor) { - RETURN_FALSE; - } - zend_list_delete((*arg)->value.lval); RETURN_TRUE; @@ -652,9 +644,7 @@ if (getParametersEx(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } - - conn = (oraConnection *) zend_fetch_resource_ex(arg, -1, "Oracle-Connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); if (ocof(&conn->lda)) { php_error(E_WARNING, "Unable to turn off auto-commit (%s)", @@ -675,8 +665,7 @@ if (getParametersEx(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } - conn = (oraConnection *) zend_fetch_resource_ex(arg, -1, "Oracle-Connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); if (ocon(&conn->lda)) { php_error(E_WARNING, "Unable to turn on auto-commit (%s)", @@ -697,8 +686,7 @@ if (getParametersEx(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } - conn = (oraConnection *) zend_fetch_resource_ex(arg, -1, "Oracle-Connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); if (ocom(&conn->lda)) { php_error(E_WARNING, "Unable to commit transaction (%s)", @@ -719,8 +707,7 @@ if (getParametersEx(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } - conn = (oraConnection *) zend_fetch_resource_ex(arg, -1, "Oracle-Connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, oraConnection *, arg, -1, "Oracle-Connection", le_conn, le_pconn); if (orol(&conn->lda)) { php_error(E_WARNING, "Unable to roll back transaction (%s)", @@ -984,9 +971,7 @@ if (ARG_COUNT(ht) != 2 || getParametersEx(2, &con,&sql) == FAILURE) { WRONG_PARAM_COUNT; } - - conn = (oraConnection *) zend_fetch_resource_ex(con, -1, "Oracle-Connection", 2, le_conn, le_pconn); - ZEND_VERIFY_RESOURCE(conn); + ZEND_FETCH_RESOURCE2(conn, oraConnection *, con, -1, "Oracle-Connection", le_conn, le_pconn); convert_to_string_ex(sql); @@ -1501,21 +1486,22 @@ pval **arg; oraCursor *cursor; oraConnection *conn; + void *res; + int what; if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } + res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); + ZEND_VERIFY_RESOURCE(res); - conn = (oraConnection *) zend_fetch_resource_ex(arg, -1, NULL, 2, le_conn, le_pconn); - if (conn) { - RETURN_STRING(ora_error(&conn->lda),1); + if (what == le_cursor) { + cursor = (oraCursor *) res; + RETURN_STRING(ora_error(&cursor->cda),1); } else { - cursor = (oraCursor *) zend_fetch_resource_ex(arg, -1, NULL, 1, le_cursor); - if (cursor) { - RETURN_STRING(ora_error(&cursor->cda),1); - } + conn = (oraConnection *) res; + RETURN_STRING(ora_error(&conn->lda),1); } - RETURN_FALSE; } /* }}} */ @@ -1526,21 +1512,22 @@ pval **arg; oraCursor *cursor; oraConnection *conn; + void *res; + int what; if (ARG_COUNT(ht) != 1 || getParametersEx(1, &arg) == FAILURE) { WRONG_PARAM_COUNT; } + res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); + ZEND_VERIFY_RESOURCE(res); - conn = (oraConnection *) zend_fetch_resource_ex(arg, -1, NULL, 2, le_conn, le_pconn); - if (conn) { - RETURN_LONG(conn->lda.rc); + if (what == le_cursor) { + cursor = (oraCursor *) res; + RETURN_LONG(cursor->cda.rc); } else { - cursor = (oraCursor *) zend_fetch_resource_ex(arg, -1, NULL, 1, le_cursor); - if (cursor) { - RETURN_LONG(cursor->cda.rc); - } + conn = (oraConnection *) res; + RETURN_LONG(conn->lda.rc); } - RETURN_FALSE; } /* }}} */ @@ -1566,7 +1553,7 @@ oraConnection *db_conn; ORALS_FETCH(); - cursor = (oraCursor *) zend_fetch_resource_ex(ind, -1, "Oracle-Cursor", 1, le_cursor); + cursor = (oraCursor *) zend_fetch_resource(ind, -1, "Oracle-Cursor", NULL, 1, le_cursor); if (! cursor) { return NULL; } Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.4 php4/ext/sybase_ct/php_sybase_ct.c:1.5 --- php4/ext/sybase_ct/php_sybase_ct.c:1.4 Fri Sep 24 10:11:53 1999 +++ php4/ext/sybase_ct/php_sybase_ct.c Tue Oct 12 10:53:12 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.4 1999/09/24 14:11:53 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.5 1999/10/12 14:53:12 thies Exp $ */ #include "php.h" @@ -642,10 +642,10 @@ 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 @@ 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 @@ 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 @@ - 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;