cvs: /php4/ext/mssql php_mssql.c

fmk Mon Apr 17 12:55:21 2000 EDT Modified files: /php4/ext/mssql php_mssql.c Log: minor optimization Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.15 php4/ext/mssql/php_mssql.c:1.16 --- php4/ext/mssql/php_mssql.c:1.15 Sat Apr 15 12:30:45 2000 +++ php4/ext/mssql/php_mssql.c Mon Apr 17 12:54:50 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.15 2000/04/15 19:30:45 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.16 2000/04/17 19:54:50 fmk Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" @@ -563,10 +563,8 @@ } -static int php_mssql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) +static int php_mssql_get_default_link(INTERNAL_FUNCTION_PARAMETERS MSSQLLS_DC) { - MSSQLLS_FETCH(); - if (MS_SQL_G(default_link)==-1) { /* no link opened yet, implicitly open one */ ht = 0; php_mssql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0); @@ -604,7 +602,7 @@ switch (ARG_COUNT(ht)) { case 0: - id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MSSQLLS_CC); CHECK_LINK(id); break; case 1: @@ -640,7 +638,7 @@ if (zend_get_parameters_ex(1, &db)==FAILURE) { RETURN_FALSE; } - id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MSSQLLS_CC); CHECK_LINK(id); break; case 2: @@ -771,7 +769,7 @@ if (zend_get_parameters_ex(1, &query)==FAILURE) { RETURN_FALSE; } - id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + id = php_mssql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU MSSQLLS_CC); CHECK_LINK(id); break; case 2: @@ -902,6 +900,10 @@ WRONG_PARAM_COUNT; } + if ((*mssql_result_index)->type==IS_RESOURCE && (*mssql_result_index)->value.lval==0) { + RETURN_FALSE; + } + ZEND_FETCH_RESOURCE(result, mssql_result *, mssql_result_index, -1, "MS SQL-result", le_result); zend_list_delete((*mssql_result_index)->value.lval); RETURN_TRUE;