cvs: php4 /ext/fbsql php_fbsql.c php_fbsql.h

fmk Wed Apr 4 13:10:14 2001 EDT Modified files: /php4/ext/fbsql php_fbsql.h php_fbsql.c Log: Adding empty RSHUTDOWN function. Index: php4/ext/fbsql/php_fbsql.h diff -u php4/ext/fbsql/php_fbsql.h:1.1 php4/ext/fbsql/php_fbsql.h:1.2 --- php4/ext/fbsql/php_fbsql.h:1.1 Tue Mar 13 12:58:47 2001 +++ php4/ext/fbsql/php_fbsql.h Wed Apr 4 13:10:14 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.h,v 1.1 2001/03/13 20:58:47 fmk Exp $ */ +/* $Id: php_fbsql.h,v 1.2 2001/04/04 20:10:14 fmk Exp $ */ #define HAVE_FBSQL 1 @@ -39,8 +39,9 @@ #include <FBCAccess/FBCAccess.h> extern PHP_MINIT_FUNCTION(fbsql); -extern PHP_RINIT_FUNCTION(fbsql); extern PHP_MSHUTDOWN_FUNCTION(fbsql); +extern PHP_RINIT_FUNCTION(fbsql); +extern PHP_RSHUTDOWN_FUNCTION(fbsql); PHP_MINFO_FUNCTION(fbsql); PHP_FUNCTION(fbsql_connect); PHP_FUNCTION(fbsql_pconnect); @@ -106,7 +107,7 @@ long databaseCount; long resultCount; - int linkIndex; + unsigned int linkIndex; int databaseIndex; int resultIndex; ZEND_END_MODULE_GLOBALS(fbsql) Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.8 php4/ext/fbsql/php_fbsql.c:1.9 --- php4/ext/fbsql/php_fbsql.c:1.8 Tue Apr 3 11:09:02 2001 +++ php4/ext/fbsql/php_fbsql.c Wed Apr 4 13:10:14 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.8 2001/04/03 18:09:02 fmk Exp $ */ +/* $Id: php_fbsql.c,v 1.9 2001/04/04 20:10:14 fmk Exp $ */ /* TODO: * @@ -237,7 +237,7 @@ PHP_MINIT(fbsql), PHP_MSHUTDOWN(fbsql), PHP_RINIT(fbsql), - NULL, + PHP_RSHUTDOWN(fbsql), PHP_MINFO(fbsql), STANDARD_MODULE_PROPERTIES }; @@ -361,12 +361,13 @@ void phpfbReleaseLink (PHPFBLink* link) { + FBSQLLS_FETCH(); if (link) { link->retainCount--; if (link->retainCount == 0) { -/* if (link->index == FB_SQL_G(linkIndex) FB_SQL_G(linkIndex = 0; */ + if (link->index == FB_SQL_G(linkIndex)) FB_SQL_G(linkIndex)--; free(link->hostName); free(link->userName); free(link->userPassword); @@ -446,6 +447,11 @@ } PHP_RINIT_FUNCTION(fbsql) +{ + return SUCCESS; +} + +PHP_RSHUTDOWN_FUNCTION(fbsql) { return SUCCESS; }