cvs: /php3/functions interbase.c oci8.c pcre.c

rasmus Wed Aug 18 14:11:03 1999 EDT Modified files: /php3/functions interbase.c oci8.c pcre.c Log: Clean up some function descriptions Index: php3/functions/interbase.c diff -u php3/functions/interbase.c:1.17 php3/functions/interbase.c:1.18 --- php3/functions/interbase.c:1.17 Wed May 26 09:08:50 1999 +++ php3/functions/interbase.c Wed Aug 18 14:11:03 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.17 1999/05/26 13:08:50 sas Exp $ */ +/* $Id: interbase.c,v 1.18 1999/08/18 18:11:03 rasmus Exp $ */ /* TODO: Arrays, roles? A lot... */ @@ -217,8 +217,8 @@ /* error handling ---------------------------- */ -/* {{{ proto string ibase_errmsg() */ -/* Return error message */ +/* {{{ proto string ibase_errmsg() + Return error message */ void php3_ibase_errmsg(INTERNAL_FUNCTION_PARAMETERS) { char *errmsg = IBASE_GLOBAL(php3_ibase_module).errmsg; @@ -232,8 +232,8 @@ /* }}} */ -/* {{{ _php3_ibase_error() */ -/* print interbase error and save it for ibase_errmsg() */ +/* {{{ _php3_ibase_error() + print interbase error and save it for ibase_errmsg() */ static void _php3_ibase_error(void) { char *s, *errmsg = IBASE_GLOBAL(php3_ibase_module).errmsg; @@ -249,8 +249,8 @@ /* }}} */ -/* {{{ _php3_ibase_module_error() */ -/* print php interbase module error and save it for ibase_errmsg() */ +/* {{{ _php3_ibase_module_error() + print php interbase module error and save it for ibase_errmsg() */ static void _php3_ibase_module_error(char *msg, ...) { char *errmsg = IBASE_GLOBAL(php3_ibase_module).errmsg; @@ -474,7 +474,7 @@ void php3_info_ibase(void) { - php3_printf("$Revision: 1.17 $"); + php3_printf("$Revision: 1.18 $"); } /* }}} */ @@ -708,8 +708,8 @@ /* }}} */ -/* {{{ proto int ibase_connect(string database [, string username] [, string password] [, string charset]) */ -/* Open a connection to an InterBase database */ +/* {{{ proto int ibase_connect(string database [, string username] [, string password] [, string charset]) + Open a connection to an InterBase database */ PHP_FUNCTION(ibase_connect) { _php3_ibase_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); @@ -717,8 +717,8 @@ /* }}} */ -/* {{{ proto int ibase_pconnect(string database [, string username] [, string password] [, string charset] ) */ -/* Open a persistent connection to an InterBase database */ +/* {{{ proto int ibase_pconnect(string database [, string username] [, string password] [, string charset] ) + Open a persistent connection to an InterBase database */ PHP_FUNCTION(ibase_pconnect) { _php3_ibase_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); @@ -726,8 +726,8 @@ /* }}} */ -/* {{{ proto int ibase_close([int link_identifier]) */ -/* Close an InterBase connection */ +/* {{{ proto int ibase_close([int link_identifier]) + Close an InterBase connection */ PHP_FUNCTION(ibase_close) { pval *link_arg; @@ -1175,8 +1175,8 @@ /* }}} */ -/* {{{ proto int ibase_trans([int trans_args [, int link_identifier]]) */ -/* Start transaction */ +/* {{{ proto int ibase_trans([int trans_args [, int link_identifier]]) + Start transaction */ PHP_FUNCTION(ibase_trans) { pval **args; @@ -1333,8 +1333,8 @@ /* }}} */ -/* {{{ proto int ibase_commit([int link_identifier, ] int trans_number) */ -/* Commit transaction */ +/* {{{ proto int ibase_commit([int link_identifier, ] int trans_number) + Commit transaction */ PHP_FUNCTION(ibase_commit) { _php3_ibase_trans_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, COMMIT); @@ -1342,8 +1342,8 @@ /* }}} */ -/* {{{ proto int ibase_rollback([int link_identifier, ] int trans_number) */ -/* Roolback transaction */ +/* {{{ proto int ibase_rollback([int link_identifier, ] int trans_number) + Roolback transaction */ PHP_FUNCTION(ibase_rollback) { _php3_ibase_trans_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, ROLLBACK); @@ -1351,8 +1351,8 @@ /* }}} */ -/* {{{ proto int ibase_query([int link_identifier, ]string query[,bind args]) */ -/* Execute a query. */ +/* {{{ proto int ibase_query([int link_identifier, ]string query[,bind args]) + Execute a query. */ PHP_FUNCTION(ibase_query) { pval **args, **bind_args = NULL; @@ -1755,8 +1755,8 @@ /* }}} */ -/* {{{ proto array ibase_fetch_row(int result [,blob_flag]) */ -/* Fetch a row from the results of a query. */ +/* {{{ proto array ibase_fetch_row(int result [,blob_flag]) + Fetch a row from the results of a query. */ PHP_FUNCTION(ibase_fetch_row) { _php3_ibase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FETCH_ARRAY); @@ -1764,8 +1764,8 @@ /* }}} */ -/* {{{ proto object ibase_fetch_object(int result [,blob_flag]) */ -/* Fetch a object from the results of a query. */ +/* {{{ proto object ibase_fetch_object(int result [,blob_flag]) + Fetch a object from the results of a query. */ PHP_FUNCTION(ibase_fetch_object) { _php3_ibase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FETCH_OBJECT); @@ -1773,8 +1773,8 @@ /* }}} */ -/* {{{ proto int ibase_free_result(int result) */ -/* Free the memory used by a result. */ +/* {{{ proto int ibase_free_result(int result) + Free the memory used by a result. */ PHP_FUNCTION(ibase_free_result) { pval *result_arg; @@ -1800,8 +1800,8 @@ /* }}} */ -/* {{{ proto int ibase_prepare([int link_identifier, ]string query) */ -/* Prepare a query for later execution. */ +/* {{{ proto int ibase_prepare([int link_identifier, ]string query) + Prepare a query for later execution. */ PHP_FUNCTION(ibase_prepare) { pval *link_arg, *query_arg; @@ -1852,8 +1852,8 @@ /* }}} */ -/* {{{ proto int ibase_execute(int query [,bind_args ... ]) */ -/* Execute a previously prepared query. */ +/* {{{ proto int ibase_execute(int query [,bind_args ... ]) + Execute a previously prepared query. */ PHP_FUNCTION(ibase_execute) { pval **args, **bind_args = NULL; @@ -1896,8 +1896,8 @@ /* }}} */ -/* {{{ proto int ibase_free_query(int query) */ -/* Free memory used by a query */ +/* {{{ proto int ibase_free_query(int query) + Free memory used by a query */ PHP_FUNCTION(ibase_free_query) { pval *query_arg; @@ -1921,8 +1921,8 @@ /* }}} */ -/* {{{ proto int ibase_timefmt(string format) */ -/* Sets the format of datetime columns returned from queries. Still nonfunctional. */ +/* {{{ proto int ibase_timefmt(string format) + Sets the format of datetime columns returned from queries. Still nonfunctional. */ PHP_FUNCTION(ibase_timefmt) { pval *fmt; @@ -1947,8 +1947,8 @@ /* }}} */ -/* {{{ proto int ibase_num_fields(int result) */ -/* Get the number of fields in result */ +/* {{{ proto int ibase_num_fields(int result) + Get the number of fields in result */ PHP_FUNCTION(ibase_num_fields) { pval *result; @@ -1980,8 +1980,8 @@ /* }}} */ -/* {{{ proto array ibase_field_info(int result, int field_number) */ -/* Get information about a field */ +/* {{{ proto array ibase_field_info(int result, int field_number) + Get information about a field */ PHP_FUNCTION(ibase_field_info) { pval *ret_val, *result_arg, *field_arg; @@ -2112,8 +2112,8 @@ /* }}} */ -/* {{{ proto int ibase_blob_create([int link_identifier]) */ -/* Create blob for adding data */ +/* {{{ proto int ibase_blob_create([int link_identifier]) + Create blob for adding data */ PHP_FUNCTION(ibase_blob_create) { pval *link_arg; @@ -2164,8 +2164,8 @@ /* }}} */ -/* {{{ proto int ibase_blob_open(string blob_id) */ -/* Open blob for retriving data parts */ +/* {{{ proto int ibase_blob_open(string blob_id) + Open blob for retriving data parts */ PHP_FUNCTION(ibase_blob_open) { pval *blob_arg; @@ -2203,8 +2203,8 @@ /* }}} */ -/* {{{ proto int ibase_blob_add(int blob_id, string data) */ -/* Add data into created blob */ +/* {{{ proto int ibase_blob_add(int blob_id, string data) + Add data into created blob */ PHP_FUNCTION(ibase_blob_add) { pval *blob_arg,*string_arg; @@ -2231,8 +2231,8 @@ /* }}} */ -/* {{{ proto string ibase_blob_get(int blob_id, int len) */ -/* Get len bytes data from open blob */ +/* {{{ proto string ibase_blob_get(int blob_id, int len) + Get len bytes data from open blob */ PHP_FUNCTION(ibase_blob_get) { pval *blob_arg, *len_arg; @@ -2325,8 +2325,8 @@ /* }}} */ -/* {{{ proto int ibase_blob_close(int blob_id) */ -/* Close blob */ +/* {{{ proto int ibase_blob_close(int blob_id) + Close blob */ PHP_FUNCTION(ibase_blob_close) { _php3_ibase_blob_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,BLOB_CLOSE); @@ -2334,8 +2334,8 @@ /* }}} */ -/* {{{ proto int ibase_blob_cancel(int blob_id) */ -/* Cancel creating blob */ +/* {{{ proto int ibase_blob_cancel(int blob_id) + Cancel creating blob */ PHP_FUNCTION(ibase_blob_cancel) { _php3_ibase_blob_end(INTERNAL_FUNCTION_PARAM_PASSTHRU,BLOB_CANCEL); @@ -2343,8 +2343,8 @@ /* }}} */ -/* {{{ proto object ibase_blob_info(string blob_id_str) */ -/* Return blob length and other useful info */ +/* {{{ proto object ibase_blob_info(string blob_id_str) + Return blob length and other useful info */ PHP_FUNCTION(ibase_blob_info) { pval *blob_arg, *result_var; @@ -2408,8 +2408,8 @@ /* }}} */ -/* {{{ proto int ibase_blob_echo(string blob_id_str) */ -/* Output blob contents to browser */ +/* {{{ proto int ibase_blob_echo(string blob_id_str) + Output blob contents to browser */ PHP_FUNCTION(ibase_blob_echo) { pval *blob_arg; @@ -2466,8 +2466,8 @@ extern int le_fp,le_pp; extern int wsa_fp; -/* {{{ proto string ibase_blob_import([link_identifier, ] file_id) */ -/* Create blob, copy file in it, and close it*/ +/* {{{ proto string ibase_blob_import([link_identifier, ] file_id) + Create blob, copy file in it, and close it*/ PHP_FUNCTION(ibase_blob_import) { pval *link_arg, *file_arg; Index: php3/functions/oci8.c diff -u php3/functions/oci8.c:1.118 php3/functions/oci8.c:1.119 --- php3/functions/oci8.c:1.118 Sun Aug 8 12:22:26 1999 +++ php3/functions/oci8.c Wed Aug 18 14:11:03 1999 @@ -33,7 +33,7 @@ #define OCI8_USE_EMALLOC 0 /* set this to 1 if you want to use the php memory manager! */ -/* $Id: oci8.c,v 1.118 1999/08/08 16:22:26 kara Exp $ */ +/* $Id: oci8.c,v 1.119 1999/08/18 18:11:03 rasmus Exp $ */ /* TODO list: * @@ -2532,7 +2532,7 @@ } /* }}} */ -/* {{{ proto string ocifreedesc(object lob) +/* {{{ ocifreedesc(object lob) */ PHP_FUNCTION(oci8_freedesc) @@ -2572,7 +2572,7 @@ RETURN_FALSE; } /* }}} */ -/* {{{ proto string ocisavedesc(object lob) +/* {{{ ocisavedesc(object lob) */ PHP_FUNCTION(oci8_savedesc) @@ -2653,7 +2653,7 @@ } /* }}} */ -/* {{{ proto string ocisavedescfile(object lob) +/* {{{ ocisavedescfile(object lob) * */ PHP_FUNCTION(oci8_savedescfile) @@ -2740,7 +2740,7 @@ } /* }}} */ -/* {{{ proto string ociloaddesc(object lob) +/* {{{ ociloaddesc(object lob) */ PHP_FUNCTION(oci8_loaddesc) @@ -3710,9 +3710,7 @@ /* }}} */ /* {{{ proto string OCIServerVersion(int conn) - Return a string containing server version information. - */ - + Return a string containing server version information. */ PHP_FUNCTION(oci8_serverversion) { oci8_connection *connection; @@ -3744,12 +3742,11 @@ } /* }}} */ -/* {{{ proto int OCIStatementType(int stmt) - Return the query type of an OCI statement. - */ - + /* XXX it would be better with a general interface to OCIAttrGet() */ +/* {{{ proto int OCIStatementType(int stmt) + Return the query type of an OCI statement. */ PHP_FUNCTION(oci8_statementtype) { pval *stmt; Index: php3/functions/pcre.c diff -u php3/functions/pcre.c:1.15 php3/functions/pcre.c:1.16 --- php3/functions/pcre.c:1.15 Mon Aug 2 01:15:47 1999 +++ php3/functions/pcre.c Wed Aug 18 14:11:03 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pcre.c,v 1.15 1999/08/02 05:15:47 eschmid Exp $ */ +/* $Id: pcre.c,v 1.16 1999/08/18 18:11:03 rasmus Exp $ */ #include "php.h" @@ -724,7 +724,8 @@ /* }}} */ -/* {{{ proto preg_split(string pattern, string subject [, int limit ]) */ +/* {{{ proto preg_split(string pattern, string subject [, int limit ]) + split string into an array using a perl-style regular expression as a delimiter */ PHP_FUNCTION(preg_split) { pval *regex, /* Regular expression to split by */