cvs: php4 /ext/fbsql php_fbsql.c

fmk Wed Oct 10 18:24:57 2001 EDT Modified files: /php4/ext/fbsql php_fbsql.c Log: Changed return value for BLOB/CLOB values to a string. and returning false if no handle is created. Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.53 php4/ext/fbsql/php_fbsql.c:1.54 --- php4/ext/fbsql/php_fbsql.c:1.53 Tue Oct 9 20:42:00 2001 +++ php4/ext/fbsql/php_fbsql.c Wed Oct 10 18:24:57 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.53 2001/10/10 00:42:00 fmk Exp $ */ +/* $Id: php_fbsql.c,v 1.54 2001/10/10 22:24:57 fmk Exp $ */ /* TODO: * @@ -63,7 +63,7 @@ #include "php_fbsql.h" #include <signal.h> -static int le_result, le_link, le_plink, le_lob; +static int le_result, le_link, le_plink; struct PHPFBResult; typedef struct PHPFBResult PHPFBResult; @@ -252,7 +252,6 @@ static void phpfbReleaseResult (zend_rsrc_list_entry *rsrc TSRMLS_DC); static void phpfbReleaseLink (zend_rsrc_list_entry *rsrc TSRMLS_DC); static void phpfbReleasePLink (zend_rsrc_list_entry *rsrc TSRMLS_DC); -static void phpfbReleaseLOB (zend_rsrc_list_entry *rsrc TSRMLS_DC); static void phpfbReleaseResult(zend_rsrc_list_entry *rsrc TSRMLS_DC) { @@ -318,16 +317,6 @@ } } -static void phpfbReleaseLOB(zend_rsrc_list_entry *rsrc TSRMLS_DC) -{ - FBCBlobHandle *lobHandle = (FBCBlobHandle *)rsrc->ptr; - - if (lobHandle) - { - fbcbhRelease(lobHandle); - } -} - static void php_fbsql_set_default_link(int id TSRMLS_DC) { if (FB_SQL_G(linkIndex)!=-1) { @@ -395,7 +384,6 @@ le_result = zend_register_list_destructors_ex(phpfbReleaseResult, NULL, "fbsql result", module_number); le_link = zend_register_list_destructors_ex(phpfbReleaseLink, NULL, "fbsql link", module_number); le_plink = zend_register_list_destructors_ex(NULL, phpfbReleasePLink, "fbsql plink", module_number); - le_lob = zend_register_list_destructors_ex(phpfbReleaseLOB, NULL, "fbsql lob handle", module_number); Z_TYPE(fbsql_module_entry) = type; REGISTER_LONG_CONSTANT("FBSQL_ASSOC", FBSQL_ASSOC, CONST_CS | CONST_PERSISTENT); @@ -950,10 +938,15 @@ lobHandle = fbcdcWriteCLOB(phpLink->connection, Z_STRVAL_PP(lob_data)); break; } - ZEND_REGISTER_RESOURCE(return_value, lobHandle, le_lob); + if (lobHandle) { + RETURN_STRING(fbcbhDescription(lobHandle), 1); + fbcbhRelease(lobHandle); + } + else + RETURN_FALSE; } -/* {{{ proto resource fbsql_create_blob(string blob_data [, resource link_identifier]) +/* {{{ proto string fbsql_create_blob(string blob_data [, resource link_identifier]) */ PHP_FUNCTION(fbsql_create_blob) { @@ -961,7 +954,7 @@ } /* }}} */ -/* {{{ proto resource fbsql_create_clob(string clob_data [, resource link_identifier]) +/* {{{ proto string fbsql_create_clob(string clob_data [, resource link_identifier]) */ PHP_FUNCTION(fbsql_create_clob) {