CVS update: php3/functions

Date: Tuesday March 9, 1999 @ 1:23 Author: andrew Update of /repository/php3/functions In directory asf:/u/temp/cvs-serv17084/functions Modified Files: interbase.c Log Message: fixed problem with not closed transactions on persistent connection Index: php3/functions/interbase.c diff -c php3/functions/interbase.c:1.12 php3/functions/interbase.c:1.13 *** php3/functions/interbase.c:1.12 Tue Mar 2 08:08:30 1999 --- php3/functions/interbase.c Tue Mar 9 01:23:14 1999 *************** *** 28,34 **** +----------------------------------------------------------------------+ */ ! /* $Id: interbase.c,v 1.12 1999/03/02 13:08:30 andrew Exp $ */ /* TODO: Arrays, roles? A lot... */ --- 28,34 ---- +----------------------------------------------------------------------+ */ ! /* $Id: interbase.c,v 1.13 1999/03/09 06:23:14 andrew Exp $ */ /* TODO: Arrays, roles? A lot... */ *************** *** 46,52 **** #include "fsock.h" #include "head.h" ! /* {{{ extension definition structures */ /*FOLD00*/ function_entry ibase_functions[] = { {"ibase_connect", php3_ibase_connect, NULL}, {"ibase_pconnect", php3_ibase_pconnect, NULL}, --- 46,52 ---- #include "fsock.h" #include "head.h" ! /* {{{ extension definition structures */ /*fold00*/ function_entry ibase_functions[] = { {"ibase_connect", php3_ibase_connect, NULL}, {"ibase_pconnect", php3_ibase_pconnect, NULL}, *************** *** 89,101 **** NULL, php3_rinit_ibase, php3_rfinish_ibase, ! php3_info_ibase, STANDARD_MODULE_PROPERTIES }; /* }}} */ ! /* {{{ internal macros and structs */ /*FOLD00*/ /* db_handle and transaction handle keep in one variable link = db_handle * IBASE_TRANS_ON_LINK + trans_handle --- 89,101 ---- NULL, php3_rinit_ibase, php3_rfinish_ibase, ! NULL /*php3_info_ibase*/, STANDARD_MODULE_PROPERTIES }; /* }}} */ ! /* {{{ internal macros and structs */ /*fold00*/ /* db_handle and transaction handle keep in one variable link = db_handle * IBASE_TRANS_ON_LINK + trans_handle *************** *** 189,195 **** /* }}} */ ! /* {{{ thread safety stuff */ /*FOLD00*/ #if defined(THREAD_SAFE) typedef ibase_global_struct{ ibase_module php3_ibase_module; --- 189,195 ---- /* }}} */ ! /* {{{ thread safety stuff */ /*fold00*/ #if defined(THREAD_SAFE) typedef ibase_global_struct{ ibase_module php3_ibase_module; *************** *** 210,216 **** /* error handling ---------------------------- */ ! /* {{{ proto string ibase_errmsg() */ /*FOLD00*/ /* Return error message */ void php3_ibase_errmsg(INTERNAL_FUNCTION_PARAMETERS) { --- 210,216 ---- /* error handling ---------------------------- */ ! /* {{{ proto string ibase_errmsg() */ /*fold00*/ /* Return error message */ void php3_ibase_errmsg(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 224,230 **** /* }}} */ ! /* {{{ _php3_ibase_error() */ /*FOLD00*/ /* print interbase error and save it for ibase_errmsg() */ static void _php3_ibase_error(ISC_STATUS *status) { --- 224,230 ---- /* }}} */ ! /* {{{ _php3_ibase_error() */ /*fold00*/ /* print interbase error and save it for ibase_errmsg() */ static void _php3_ibase_error(ISC_STATUS *status) { *************** *** 240,246 **** /* }}} */ ! /* {{{ _php3_module_error() */ /*FOLD00*/ /* print php interbase module error and save it for ibase_errmsg() */ static void _php3_module_error(char *msg, ...) { --- 240,246 ---- /* }}} */ ! /* {{{ _php3_module_error() */ /*fold00*/ /* print php interbase module error and save it for ibase_errmsg() */ static void _php3_module_error(char *msg, ...) { *************** *** 261,267 **** /* destructors ---------------------- */ ! /* {{{ _php3_ibase_free_xsqlda() */ /*FOLD00*/ /* not actual destructor ... */ static void _php3_ibase_free_xsqlda(XSQLDA *sqlda) { --- 261,267 ---- /* destructors ---------------------- */ ! /* {{{ _php3_ibase_free_xsqlda() */ /*fold00*/ /* not actual destructor ... */ static void _php3_ibase_free_xsqlda(XSQLDA *sqlda) { *************** *** 281,309 **** /* }}} */ ! /* {{{ _php3_ibase_commit_link() */ /*FOLD00*/ static void _php3_ibase_commit_link(ibase_db_link *link) { ISC_STATUS status[20]; int i; ! if(link->trans[0] != NULL){ /* commit default */ if(isc_commit_transaction(status, &link->trans[0])){ _php3_ibase_error(status); } } for(i = 1; i < IBASE_TRANS_ON_LINK; i++){ if(link->trans[i] != NULL){ if(isc_rollback_transaction(status, &link->trans[i])){ _php3_ibase_error(status); } } } } /* }}} */ ! /* {{{ _php3_ibase_close_link() */ /*FOLD00*/ static void _php3_ibase_close_link(ibase_db_link *link) { ISC_STATUS status[20]; --- 281,311 ---- /* }}} */ ! /* {{{ _php3_ibase_commit_link() */ /*fold00*/ static void _php3_ibase_commit_link(ibase_db_link *link) { ISC_STATUS status[20]; int i; ! if(link->trans[0] != NULL){ /* commit default */ if(isc_commit_transaction(status, &link->trans[0])){ _php3_ibase_error(status); } + link->trans[0] = NULL; } for(i = 1; i < IBASE_TRANS_ON_LINK; i++){ if(link->trans[i] != NULL){ if(isc_rollback_transaction(status, &link->trans[i])){ _php3_ibase_error(status); } + link->trans[i] = NULL; } } } /* }}} */ ! /* {{{ _php3_ibase_close_link() */ /*fold00*/ static void _php3_ibase_close_link(ibase_db_link *link) { ISC_STATUS status[20]; *************** *** 317,323 **** /* }}} */ ! /* {{{ _php3_ibase_close_plink() */ /*FOLD00*/ static void _php3_ibase_close_plink(ibase_db_link *link) { ISC_STATUS status[20]; --- 319,325 ---- /* }}} */ ! /* {{{ _php3_ibase_close_plink() */ /*fold00*/ static void _php3_ibase_close_plink(ibase_db_link *link) { ISC_STATUS status[20]; *************** *** 332,338 **** /* }}} */ ! /* {{{ _php3_ibase_free_result() */ /*FOLD00*/ static void _php3_ibase_free_result(ibase_result *ib_result) { ISC_STATUS status[20]; --- 334,340 ---- /* }}} */ ! /* {{{ _php3_ibase_free_result() */ /*fold00*/ static void _php3_ibase_free_result(ibase_result *ib_result) { ISC_STATUS status[20]; *************** *** 354,360 **** /* }}} */ ! /* {{{ _php3_ibase_free_query() */ /*FOLD00*/ static void _php3_ibase_free_query(ibase_query *ib_query) { ISC_STATUS status[20]; --- 356,362 ---- /* }}} */ ! /* {{{ _php3_ibase_free_query() */ /*fold00*/ static void _php3_ibase_free_query(ibase_query *ib_query) { ISC_STATUS status[20]; *************** *** 377,383 **** /* }}} */ ! /* {{{ _php3_ibase_free_blob() */ /*FOLD00*/ static void _php3_ibase_free_blob(ibase_blob_handle *ib_blob) { ISC_STATUS status[20]; --- 379,385 ---- /* }}} */ ! /* {{{ _php3_ibase_free_blob() */ /*fold00*/ static void _php3_ibase_free_blob(ibase_blob_handle *ib_blob) { ISC_STATUS status[20]; *************** *** 393,399 **** /* }}} */ ! /* {{{ startup, shutdown and info functions */ /*FOLD00*/ int php3_minit_ibase(INIT_FUNC_ARGS) { IBASE_TLS_VARS; --- 395,401 ---- /* }}} */ ! /* {{{ startup, shutdown and info functions */ /*fold00*/ int php3_minit_ibase(INIT_FUNC_ARGS) { IBASE_TLS_VARS; *************** *** 423,429 **** IBASE_GLOBAL(php3_ibase_module).le_query = register_list_destructors(_php3_ibase_free_query, NULL); IBASE_GLOBAL(php3_ibase_module).le_blob = register_list_destructors(_php3_ibase_free_blob, NULL); IBASE_GLOBAL(php3_ibase_module).le_link = register_list_destructors(_php3_ibase_close_link, NULL); ! IBASE_GLOBAL(php3_ibase_module).le_plink = register_list_destructors(NULL, _php3_ibase_close_plink); return SUCCESS; } --- 425,431 ---- IBASE_GLOBAL(php3_ibase_module).le_query = register_list_destructors(_php3_ibase_free_query, NULL); IBASE_GLOBAL(php3_ibase_module).le_blob = register_list_destructors(_php3_ibase_free_blob, NULL); IBASE_GLOBAL(php3_ibase_module).le_link = register_list_destructors(_php3_ibase_close_link, NULL); ! IBASE_GLOBAL(php3_ibase_module).le_plink = register_list_destructors(_php3_ibase_commit_link, _php3_ibase_close_plink); return SUCCESS; } *************** *** 455,468 **** } ! void php3_info_ibase(void) /*FOLD00*/ { php3_printf(""); } /* }}} */ ! /* {{{ _php_ibase_attach_db() */ /*FOLD00*/ static int _php_ibase_attach_db(char *server, char *uname, char *passwd, char *charset, int buffers, char *role, isc_db_handle *db) { char dpb_buffer[256], *dpb, *p; --- 457,470 ---- } ! void php3_info_ibase(void) /*fold00*/ { php3_printf(""); } /* }}} */ ! /* {{{ _php_ibase_attach_db() */ /*fold00*/ static int _php_ibase_attach_db(char *server, char *uname, char *passwd, char *charset, int buffers, char *role, isc_db_handle *db) { char dpb_buffer[256], *dpb, *p; *************** *** 524,530 **** /* }}} */ ! /* {{{ _php3_ibase_connect() */ /*FOLD00*/ static void _php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { pval *server, *uname, *passwd; --- 526,532 ---- /* }}} */ ! /* {{{ _php3_ibase_connect() */ /*fold00*/ static void _php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { pval *server, *uname, *passwd; *************** *** 632,638 **** new_le.ptr = ib_link; if (_php3_hash_update(plist, hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) { efree(hashed_details); ! efree(ib_link); RETURN_FALSE; } IBASE_GLOBAL(php3_ibase_module).num_links++; --- 634,640 ---- new_le.ptr = ib_link; if (_php3_hash_update(plist, hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) { efree(hashed_details); ! free(ib_link); RETURN_FALSE; } IBASE_GLOBAL(php3_ibase_module).num_links++; *************** *** 710,716 **** /* }}} */ ! /* {{{ proto int ibase_connect(string database [, string username] [, string password]) */ /*FOLD00*/ /* Open a connection to an InterBase database */ void php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS) { --- 712,718 ---- /* }}} */ ! /* {{{ proto int ibase_connect(string database [, string username] [, string password]) */ /*fold00*/ /* Open a connection to an InterBase database */ void php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 719,725 **** /* }}} */ ! /* {{{ proto int ibase_pconnect(string database [, string username] [, string password]) */ /*FOLD00*/ /* Open a persistent connection to an InterBase database */ void php3_ibase_pconnect(INTERNAL_FUNCTION_PARAMETERS) { --- 721,727 ---- /* }}} */ ! /* {{{ proto int ibase_pconnect(string database [, string username] [, string password]) */ /*fold00*/ /* Open a persistent connection to an InterBase database */ void php3_ibase_pconnect(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 728,734 **** /* }}} */ ! /* {{{ proto int ibase_close([int link_identifier]) */ /*FOLD00*/ /* Close an InterBase connection */ void php3_ibase_close(INTERNAL_FUNCTION_PARAMETERS) { --- 730,736 ---- /* }}} */ ! /* {{{ proto int ibase_close([int link_identifier]) */ /*fold00*/ /* Close an InterBase connection */ void php3_ibase_close(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 763,769 **** /* }}} */ ! /* {{{ _php3_ibase_alloc_query() */ /*FOLD00*/ /* allocate and prepare query */ static int _php3_ibase_alloc_query(ibase_query **ib_queryp, isc_db_handle link, isc_tr_handle trans, char *query) { --- 765,771 ---- /* }}} */ ! /* {{{ _php3_ibase_alloc_query() */ /*fold00*/ /* allocate and prepare query */ static int _php3_ibase_alloc_query(ibase_query **ib_queryp, isc_db_handle link, isc_tr_handle trans, char *query) { *************** *** 852,858 **** /* }}} */ ! /* {{{ _php3_ibase_bind() */ /*FOLD00*/ /* bind php variables to XSQLDA */ static int _php3_ibase_bind(XSQLDA *sqlda, pval **b_vars, BIND_BUF *buf) { --- 854,860 ---- /* }}} */ ! /* {{{ _php3_ibase_bind() */ /*fold00*/ /* bind php variables to XSQLDA */ static int _php3_ibase_bind(XSQLDA *sqlda, pval **b_vars, BIND_BUF *buf) { *************** *** 947,953 **** /* }}} */ ! /* {{{ _php3_ibase_alloc_xsqlda() */ /*FOLD00*/ static void _php3_ibase_alloc_xsqlda(XSQLDA *sqlda) { int i; --- 949,955 ---- /* }}} */ ! /* {{{ _php3_ibase_alloc_xsqlda() */ /*fold00*/ static void _php3_ibase_alloc_xsqlda(XSQLDA *sqlda) { int i; *************** *** 988,994 **** /* }}} */ ! /* {{{ _php3_ibase_exec() */ /*FOLD00*/ static int _php3_ibase_exec(ibase_result **ib_resultp, ibase_query *ib_query, int argc, pval **args) { #define IB_RESULT (*ib_resultp) --- 990,996 ---- /* }}} */ ! /* {{{ _php3_ibase_exec() */ /*fold00*/ static int _php3_ibase_exec(ibase_result **ib_resultp, ibase_query *ib_query, int argc, pval **args) { #define IB_RESULT (*ib_resultp) *************** *** 1053,1059 **** /* }}} */ ! /* {{{ proto int ibase_trans([int link_identifier, ][string trans_args]) */ /*FOLD00*/ /* Start transaction */ void php3_ibase_trans(INTERNAL_FUNCTION_PARAMETERS) { --- 1055,1061 ---- /* }}} */ ! /* {{{ proto int ibase_trans([int link_identifier, ][string trans_args]) */ /*fold00*/ /* Start transaction */ void php3_ibase_trans(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1137,1143 **** /* }}} */ ! /* {{{ _php3_ibase_def_trans() */ /*FOLD00*/ /* open default transaction */ static int _php3_ibase_def_trans(ibase_db_link * ib_link, int trans_n) { --- 1139,1145 ---- /* }}} */ ! /* {{{ _php3_ibase_def_trans() */ /*fold00*/ /* open default transaction */ static int _php3_ibase_def_trans(ibase_db_link * ib_link, int trans_n) { *************** *** 1154,1160 **** /*}}}*/ ! /* {{{ _php3_ibase_trans_end() */ /*FOLD00*/ #define COMMIT 1 #define ROLLBACK 0 static void _php3_ibase_trans_end(INTERNAL_FUNCTION_PARAMETERS, int commit) --- 1156,1162 ---- /*}}}*/ ! /* {{{ _php3_ibase_trans_end() */ /*fold00*/ #define COMMIT 1 #define ROLLBACK 0 static void _php3_ibase_trans_end(INTERNAL_FUNCTION_PARAMETERS, int commit) *************** *** 1203,1209 **** /* }}} */ ! /* {{{ proto int ibase_commit([int link_identifier, ] int trans_number) */ /*FOLD00*/ /* Commit transaction */ void php3_ibase_commit(INTERNAL_FUNCTION_PARAMETERS) { --- 1205,1211 ---- /* }}} */ ! /* {{{ proto int ibase_commit([int link_identifier, ] int trans_number) */ /*fold00*/ /* Commit transaction */ void php3_ibase_commit(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1212,1218 **** /* }}} */ ! /* {{{ proto int ibase_rollback([int link_identifier, ] int trans_number) */ /*FOLD00*/ /* Roolback transaction */ void php3_ibase_rollback(INTERNAL_FUNCTION_PARAMETERS) { --- 1214,1220 ---- /* }}} */ ! /* {{{ proto int ibase_rollback([int link_identifier, ] int trans_number) */ /*fold00*/ /* Roolback transaction */ void php3_ibase_rollback(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1221,1227 **** /* }}} */ ! /* {{{ proto int ibase_query([int link_identifier, ]string query[,bind args]) */ /*FOLD00*/ /* Execute a query. */ void php3_ibase_query(INTERNAL_FUNCTION_PARAMETERS) { --- 1223,1229 ---- /* }}} */ ! /* {{{ proto int ibase_query([int link_identifier, ]string query[,bind args]) */ /*fold00*/ /* Execute a query. */ void php3_ibase_query(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1301,1307 **** /* }}} */ ! /* {{{ _php3_ibase_fetch_hash() */ /*FOLD00*/ static void _php3_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS) { pval *result_arg, *blflag_arg; --- 1303,1309 ---- /* }}} */ ! /* {{{ _php3_ibase_fetch_hash() */ /*fold00*/ static void _php3_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS) { pval *result_arg, *blflag_arg; *************** *** 1543,1549 **** /* }}} */ ! /* {{{ proto array ibase_fetch_row(int result [,blob_flag]) */ /*FOLD00*/ /* Fetch a row from the results of a query. */ void php3_ibase_fetch_row(INTERNAL_FUNCTION_PARAMETERS) { --- 1545,1551 ---- /* }}} */ ! /* {{{ proto array ibase_fetch_row(int result [,blob_flag]) */ /*fold00*/ /* Fetch a row from the results of a query. */ void php3_ibase_fetch_row(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1552,1558 **** /* }}} */ ! /* {{{ proto object ibase_fetch_object(int result [,blob_flag]) */ /*FOLD00*/ /* Fetch a object from the results of a query. */ void php3_ibase_fetch_object(INTERNAL_FUNCTION_PARAMETERS) { --- 1554,1560 ---- /* }}} */ ! /* {{{ proto object ibase_fetch_object(int result [,blob_flag]) */ /*fold00*/ /* Fetch a object from the results of a query. */ void php3_ibase_fetch_object(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1564,1570 **** /* }}} */ ! /* {{{ proto int ibase_free_result(int result) */ /*FOLD00*/ /* Free the memory used by a result. */ void php3_ibase_free_result(INTERNAL_FUNCTION_PARAMETERS) { --- 1566,1572 ---- /* }}} */ ! /* {{{ proto int ibase_free_result(int result) */ /*fold00*/ /* Free the memory used by a result. */ void php3_ibase_free_result(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1591,1597 **** /* }}} */ ! /* {{{ proto int ibase_prepare([int link_identifier, ]string query) */ /*FOLD00*/ /* Prepare a query for later execution. */ void php3_ibase_prepare(INTERNAL_FUNCTION_PARAMETERS) { --- 1593,1599 ---- /* }}} */ ! /* {{{ proto int ibase_prepare([int link_identifier, ]string query) */ /*fold00*/ /* Prepare a query for later execution. */ void php3_ibase_prepare(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1642,1648 **** /* }}} */ ! /* {{{ proto int ibase_execute(int query [,bind_args ... ]) */ /*FOLD00*/ /* Execute a previously prepared query. */ void php3_ibase_execute(INTERNAL_FUNCTION_PARAMETERS) { --- 1644,1650 ---- /* }}} */ ! /* {{{ proto int ibase_execute(int query [,bind_args ... ]) */ /*fold00*/ /* Execute a previously prepared query. */ void php3_ibase_execute(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1685,1691 **** /* }}} */ ! /* {{{ proto int ibase_free_query(int query) */ /*FOLD00*/ /* Free memory used by a query */ void php3_ibase_free_query(INTERNAL_FUNCTION_PARAMETERS) { --- 1687,1693 ---- /* }}} */ ! /* {{{ proto int ibase_free_query(int query) */ /*fold00*/ /* Free memory used by a query */ void php3_ibase_free_query(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1709,1715 **** /* }}} */ ! /* {{{ proto int ibase_timefmt(string format) */ /*FOLD00*/ /* Sets the format of datetime columns returned from queries. Still nonfunctional. */ void php3_ibase_timefmt(INTERNAL_FUNCTION_PARAMETERS) { --- 1711,1717 ---- /* }}} */ ! /* {{{ proto int ibase_timefmt(string format) */ /*fold00*/ /* Sets the format of datetime columns returned from queries. Still nonfunctional. */ void php3_ibase_timefmt(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1734,1740 **** /* }}} */ ! /* {{{ proto int ibase_num_fields(int result) */ /*FOLD00*/ /* Get the number of fields in result */ void php3_ibase_num_fields(INTERNAL_FUNCTION_PARAMETERS) { --- 1736,1742 ---- /* }}} */ ! /* {{{ proto int ibase_num_fields(int result) */ /*fold00*/ /* Get the number of fields in result */ void php3_ibase_num_fields(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1766,1772 **** /* }}} */ ! /* {{{ proto array ibase_field_info(int result, int field_number) */ /*FOLD00*/ /* Get information about a field */ void php3_ibase_field_info(INTERNAL_FUNCTION_PARAMETERS) { --- 1768,1774 ---- /* }}} */ ! /* {{{ proto array ibase_field_info(int result, int field_number) */ /*fold00*/ /* Get information about a field */ void php3_ibase_field_info(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1842,1848 **** /* blobs ----------------------------------- */ ! /* {{{ _php3_ibase_blob_info(isc_blob_handle bl_handle,IBASE_BLOBINFO *bl_info) */ /*FOLD00*/ static int _php3_ibase_blob_info(isc_blob_handle bl_handle,IBASE_BLOBINFO *bl_info) { ISC_STATUS status[20]; --- 1844,1850 ---- /* blobs ----------------------------------- */ ! /* {{{ _php3_ibase_blob_info(isc_blob_handle bl_handle,IBASE_BLOBINFO *bl_info) */ /*fold00*/ static int _php3_ibase_blob_info(isc_blob_handle bl_handle,IBASE_BLOBINFO *bl_info) { ISC_STATUS status[20]; *************** *** 1897,1903 **** /* }}} */ ! /* {{{ proto int ibase_blob_create([int link_identifier]) */ /*FOLD00*/ /* Create blob for adding data */ void php3_ibase_blob_create(INTERNAL_FUNCTION_PARAMETERS) { --- 1899,1905 ---- /* }}} */ ! /* {{{ proto int ibase_blob_create([int link_identifier]) */ /*fold00*/ /* Create blob for adding data */ void php3_ibase_blob_create(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1949,1955 **** /* }}} */ ! /* {{{ proto int ibase_blob_open(string blob_id) */ /*FOLD00*/ /* Open blob for retriving data parts */ void php3_ibase_blob_open(INTERNAL_FUNCTION_PARAMETERS) { --- 1951,1957 ---- /* }}} */ ! /* {{{ proto int ibase_blob_open(string blob_id) */ /*fold00*/ /* Open blob for retriving data parts */ void php3_ibase_blob_open(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 1987,1993 **** /* }}} */ ! /* {{{ proto int ibase_blob_add(int blob_id, string data) */ /*FOLD00*/ /* Add data into created blob */ void php3_ibase_blob_add(INTERNAL_FUNCTION_PARAMETERS) { --- 1989,1995 ---- /* }}} */ ! /* {{{ proto int ibase_blob_add(int blob_id, string data) */ /*fold00*/ /* Add data into created blob */ void php3_ibase_blob_add(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 2015,2021 **** /* }}} */ ! /* {{{ proto string ibase_blob_get(int blob_id, int len) */ /*FOLD00*/ /* Get len bytes data from open blob */ void php3_ibase_blob_get(INTERNAL_FUNCTION_PARAMETERS) { --- 2017,2023 ---- /* }}} */ ! /* {{{ proto string ibase_blob_get(int blob_id, int len) */ /*fold00*/ /* Get len bytes data from open blob */ void php3_ibase_blob_get(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 2069,2075 **** #define BLOB_CLOSE 1 #define BLOB_CANCEL 2 ! /* {{{ _php3_ibase_blob_end() */ /*FOLD00*/ /* Close or Cancel created or Close open blob */ static void _php3_ibase_blob_end(INTERNAL_FUNCTION_PARAMETERS, int bl_end) { --- 2071,2077 ---- #define BLOB_CLOSE 1 #define BLOB_CANCEL 2 ! /* {{{ _php3_ibase_blob_end() */ /*fold00*/ /* Close or Cancel created or Close open blob */ static void _php3_ibase_blob_end(INTERNAL_FUNCTION_PARAMETERS, int bl_end) { *************** *** 2109,2115 **** /* }}} */ ! /* {{{ proto int ibase_blob_close(int blob_id) */ /*FOLD00*/ /* Close blob */ void php3_ibase_blob_close(INTERNAL_FUNCTION_PARAMETERS) { --- 2111,2117 ---- /* }}} */ ! /* {{{ proto int ibase_blob_close(int blob_id) */ /*fold00*/ /* Close blob */ void php3_ibase_blob_close(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 2118,2124 **** /* }}} */ ! /* {{{ proto int ibase_blob_cancel(int blob_id) */ /*FOLD00*/ /* Cancel creating blob */ void php3_ibase_blob_cancel(INTERNAL_FUNCTION_PARAMETERS) { --- 2120,2126 ---- /* }}} */ ! /* {{{ proto int ibase_blob_cancel(int blob_id) */ /*fold00*/ /* Cancel creating blob */ void php3_ibase_blob_cancel(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 2127,2133 **** /* }}} */ ! /* {{{ proto object ibase_blob_info(string blob_id_str) */ /*FOLD00*/ /* Return blob length and other useful info */ void php3_ibase_blob_info(INTERNAL_FUNCTION_PARAMETERS) { --- 2129,2135 ---- /* }}} */ ! /* {{{ proto object ibase_blob_info(string blob_id_str) */ /*fold00*/ /* Return blob length and other useful info */ void php3_ibase_blob_info(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 2192,2198 **** /* }}} */ ! /* {{{ proto int ibase_blob_echo(string blob_id_str) */ /*FOLD00*/ /* Output blob contents to browser */ void php3_ibase_blob_echo(INTERNAL_FUNCTION_PARAMETERS) { --- 2194,2200 ---- /* }}} */ ! /* {{{ proto int ibase_blob_echo(string blob_id_str) */ /*fold00*/ /* Output blob contents to browser */ void php3_ibase_blob_echo(INTERNAL_FUNCTION_PARAMETERS) { *************** *** 2253,2259 **** extern int le_fp,le_pp; extern int wsa_fp; ! /* {{{ proto string ibase_blob_import([link_identifier, ] file_id) */ /*FOLD00*/ /* Create blob, copy file in it, and close it*/ void php3_ibase_blob_import(INTERNAL_FUNCTION_PARAMETERS) { --- 2255,2261 ---- extern int le_fp,le_pp; extern int wsa_fp; ! /* {{{ proto string ibase_blob_import([link_identifier, ] file_id) */ /*fold00*/ /* Create blob, copy file in it, and close it*/ void php3_ibase_blob_import(INTERNAL_FUNCTION_PARAMETERS) { -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net