cvs: php4 /ext/fbsql php_fbsql.c

fmk Tue May 22 10:32:18 2001 EDT Modified files: /php4/ext/fbsql php_fbsql.c Log: Changing how persistant links are added to zend_lists Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.20 php4/ext/fbsql/php_fbsql.c:1.21 --- php4/ext/fbsql/php_fbsql.c:1.20 Thu May 10 09:35:05 2001 +++ php4/ext/fbsql/php_fbsql.c Tue May 22 10:32:17 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.20 2001/05/10 16:35:05 fmk Exp $ */ +/* $Id: php_fbsql.c,v 1.21 2001/05/22 17:32:17 fmk Exp $ */ /* TODO: * @@ -563,14 +563,15 @@ result->results = NULL; le.ptr = result; - le.type = le_link; + le.type = persistant?le_plink:le_link; if (zend_hash_update(persistant?&EG(persistent_list):&EG(regular_list), name, strlen(name), &le, sizeof(le), NULL)==FAILURE) { /* phpfbReleaseLink(result); */ return NULL; } - result->index = zend_list_insert (phpfbRetainLink(result), le_link); + result->index = zend_list_insert (phpfbRetainLink(result), le.type); FB_SQL_G(linkCount)++; + if (persistant) FB_SQL_G(persistantCount)++; } return result; } @@ -658,7 +659,7 @@ { php_error(E_WARNING,"FrontBase has no default connection"); } - else if ((!(phpLink = (PHPFBLink*) zend_list_find (id,&type))) || ((type != le_link))) + else if ((!(phpLink = (PHPFBLink*) zend_list_find (id,&type))) || ((type != le_link && type != le_plink))) { php_error(E_WARNING,"%d is not a FBSQL link index",id); phpLink = NULL;