CVS update: php3/functions

Date: Tuesday December 15, 1998 @ 8:36 Author: rasmus Update of /repository/php3/functions In directory asf:/home/rasmus/php3/functions Modified Files: msql.c Log Message: Prototype comments Index: php3/functions/msql.c diff -c php3/functions/msql.c:1.98 php3/functions/msql.c:1.99 *** php3/functions/msql.c:1.98 Thu Nov 19 17:03:27 1998 --- php3/functions/msql.c Tue Dec 15 08:36:03 1998 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: msql.c,v 1.98 1998/11/19 22:03:27 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: msql.c,v 1.99 1998/12/15 13:36:03 rasmus Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 427,443 **** return MSQL_GLOBAL(php3_msql_module).default_link; } ! DLEXPORT void php3_msql_connect(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0); } DLEXPORT void php3_msql_pconnect(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1); } DLEXPORT void php3_msql_close(INTERNAL_FUNCTION_PARAMETERS) { pval *msql_link; --- 427,450 ---- return MSQL_GLOBAL(php3_msql_module).default_link; } ! /* {{{ proto int msql_connect([string hostname[:port]] [, string username] [, string password]) ! Open a connection to an mSQL Server */ DLEXPORT void php3_msql_connect(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0); } + /* }}} */ + /* {{{ proto int msql_pconnect([string hostname[:port]] [, string username] [, string password]) + Open a persistent connection to an mSQL Server */ DLEXPORT void php3_msql_pconnect(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1); } + /* }}} */ + /* {{{ proto int msql_close([int link_identifier]) + Close an mSQL connection */ DLEXPORT void php3_msql_close(INTERNAL_FUNCTION_PARAMETERS) { pval *msql_link; *************** *** 470,477 **** php3_list_delete(id); RETURN_TRUE; } ! ! DLEXPORT void php3_msql_select_db(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*msql_link; --- 477,486 ---- php3_list_delete(id); RETURN_TRUE; } ! /* }}} */ ! ! /* {{{ proto int msql_select_db(string database_name [, int link_identifier]) ! Select an mSQL database */ DLEXPORT void php3_msql_select_db(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*msql_link; *************** *** 512,518 **** --- 521,530 ---- RETURN_TRUE; } } + /* }}} */ + /* {{{ proto int msql_create_db(string database_name [, int link_identifier]) + Create an mSQL database */ DLEXPORT void php3_msql_create_db(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*msql_link; *************** *** 552,559 **** RETURN_TRUE; } } ! DLEXPORT void php3_msql_drop_db(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*msql_link; --- 564,573 ---- RETURN_TRUE; } } ! /* }}} */ + /* {{{ proto int msql_drop_db(string database_name [, int link_identifier]) + Drop (delete) an mSQL database */ DLEXPORT void php3_msql_drop_db(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*msql_link; *************** *** 593,600 **** RETURN_TRUE; } } ! DLEXPORT void php3_msql_query(INTERNAL_FUNCTION_PARAMETERS) { pval *query,*msql_link; --- 607,616 ---- RETURN_TRUE; } } ! /* }}} */ + /* {{{ proto int msql_query(string query [, int link_identifier]) + Send an SQL query to mSQL */ DLEXPORT void php3_msql_query(INTERNAL_FUNCTION_PARAMETERS) { pval *query,*msql_link; *************** *** 642,649 **** return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } ! DLEXPORT void php3_msql_db_query(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*query,*msql_link; --- 658,667 ---- return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } + /* }}} */ ! /* {{{ proto int msql_db_query(string database_name, string query [, int link_identifier]) ! Send an SQL query to mSQL */ DLEXPORT void php3_msql_db_query(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*query,*msql_link; *************** *** 696,703 **** return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } ! DLEXPORT void php3_msql_list_dbs(INTERNAL_FUNCTION_PARAMETERS) { pval *msql_link; --- 714,723 ---- return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } ! /* }}} */ + /* {{{ proto int msql_list_dbs([int link_identifier]) + List databases available on an mSQL server */ DLEXPORT void php3_msql_list_dbs(INTERNAL_FUNCTION_PARAMETERS) { pval *msql_link; *************** *** 734,741 **** return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } ! DLEXPORT void php3_msql_list_tables(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*msql_link; --- 754,763 ---- return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } ! /* }}} */ + /* {{{ proto int msql_list_tables(string database_name [, int link_identifier]) + List tables in an mSQL database */ DLEXPORT void php3_msql_list_tables(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*msql_link; *************** *** 780,787 **** return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } ! DLEXPORT void php3_msql_list_fields(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*table,*msql_link; --- 802,811 ---- return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } + /* }}} */ ! /* {{{ proto int msql_list_fields(string database_name, string table_name [, int link_identifier]) ! List mSQL result fields */ DLEXPORT void php3_msql_list_fields(INTERNAL_FUNCTION_PARAMETERS) { pval *db,*table,*msql_link; *************** *** 827,834 **** return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } ! void php3_msql_error(INTERNAL_FUNCTION_PARAMETERS) { if (ARG_COUNT(ht)) { --- 851,860 ---- return_value->value.lval = php3_list_insert(msql_result,MSQL_GLOBAL(php3_msql_module).le_result); return_value->type = IS_LONG; } ! /* }}} */ + /* {{{ proto string msql_error([int link_identifier]) + Returns the text of the error message from previous mSQL operation */ void php3_msql_error(INTERNAL_FUNCTION_PARAMETERS) { if (ARG_COUNT(ht)) { *************** *** 836,843 **** } RETURN_STRING(msqlErrMsg,1); } ! DLEXPORT void php3_msql_result(INTERNAL_FUNCTION_PARAMETERS) { pval *result, *row, *field=NULL; --- 862,871 ---- } RETURN_STRING(msqlErrMsg,1); } ! /* }}} */ + /* {{{ proto int msql_result(int result, int row [, mixed field]) + Get result data */ DLEXPORT void php3_msql_result(INTERNAL_FUNCTION_PARAMETERS) { pval *result, *row, *field=NULL; *************** *** 943,950 **** return_value->type = IS_STRING; } ! DLEXPORT void php3_msql_num_rows(INTERNAL_FUNCTION_PARAMETERS) { pval *result; --- 971,980 ---- return_value->type = IS_STRING; } + /* }}} */ ! /* {{{ proto int msql_num_rows(int result) ! Get number of rows in a result */ DLEXPORT void php3_msql_num_rows(INTERNAL_FUNCTION_PARAMETERS) { pval *result; *************** *** 967,974 **** return_value->value.lval = msqlNumRows(msql_result); return_value->type = IS_LONG; } ! DLEXPORT void php3_msql_num_fields(INTERNAL_FUNCTION_PARAMETERS) { pval *result; --- 997,1006 ---- return_value->value.lval = msqlNumRows(msql_result); return_value->type = IS_LONG; } ! /* }}} */ + /* {{{ proto int msql_num_fields(int result) + Get number of fields in a result */ DLEXPORT void php3_msql_num_fields(INTERNAL_FUNCTION_PARAMETERS) { pval *result; *************** *** 991,998 **** return_value->value.lval = msqlNumFields(msql_result); return_value->type = IS_LONG; } ! DLEXPORT void php3_msql_fetch_row(INTERNAL_FUNCTION_PARAMETERS) { pval *result; --- 1023,1032 ---- return_value->value.lval = msqlNumFields(msql_result); return_value->type = IS_LONG; } ! /* }}} */ + /* {{{ proto array msql_fetch_row(int result) + Get a result row as an enumerated array */ DLEXPORT void php3_msql_fetch_row(INTERNAL_FUNCTION_PARAMETERS) { pval *result; *************** *** 1030,1037 **** } } } - static void php3_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS) { pval *result; --- 1064,1071 ---- } } } + /* }}} */ static void php3_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS) { pval *result; *************** *** 1079,1086 **** _php3_hash_pointer_update(return_value->value.ht, msql_field->name, strlen(msql_field->name)+1, pval_ptr); } } - DLEXPORT void php3_msql_fetch_object(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); --- 1113,1121 ---- _php3_hash_pointer_update(return_value->value.ht, msql_field->name, strlen(msql_field->name)+1, pval_ptr); } } + /* {{{ proto object msql_fetch_object(int result) + Fetch a result row as an object */ DLEXPORT void php3_msql_fetch_object(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); *************** *** 1088,1101 **** return_value->type=IS_OBJECT; } } ! DLEXPORT void php3_msql_fetch_array(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); } ! DLEXPORT void php3_msql_data_seek(INTERNAL_FUNCTION_PARAMETERS) { pval *result,*offset; --- 1123,1140 ---- return_value->type=IS_OBJECT; } } ! /* }}} */ + /* {{{ proto array msql_fetch_array(int result) + Fetch a result row as an associative array */ DLEXPORT void php3_msql_fetch_array(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); } + /* }}} */ ! /* {{{ proto int msql_data_seek(int result, int row_number) ! Move internal result pointer */ DLEXPORT void php3_msql_data_seek(INTERNAL_FUNCTION_PARAMETERS) { pval *result,*offset; *************** *** 1122,1128 **** msqlDataSeek(msql_result,offset->value.lval); RETURN_TRUE; } ! static char *php3_msql_get_field_name(int field_type) { --- 1161,1167 ---- msqlDataSeek(msql_result,offset->value.lval); RETURN_TRUE; } ! /* }}} */ static char *php3_msql_get_field_name(int field_type) { *************** *** 1161,1168 **** break; } } - DLEXPORT void php3_msql_fetch_field(INTERNAL_FUNCTION_PARAMETERS) { pval *result, *field=NULL; --- 1200,1208 ---- break; } } + /* {{{ proto object msql_fetch_field(int result [, int field_offset]) + Get column information from a result and return as an object */ DLEXPORT void php3_msql_fetch_field(INTERNAL_FUNCTION_PARAMETERS) { pval *result, *field=NULL; *************** *** 1219,1225 **** --- 1259,1268 ---- add_property_string(return_value, "type",php3_msql_get_field_name(msql_field->type), 1); } + /* }}} */ + /* {{{ proto int msql_field_seek(int result, int field_offset) + Set result pointer to a specific field offset */ DLEXPORT void php3_msql_field_seek(INTERNAL_FUNCTION_PARAMETERS) { pval *result, *offset; *************** *** 1246,1253 **** msqlFieldSeek(msql_result,offset->value.lval); RETURN_TRUE; } - #define PHP3_MSQL_FIELD_NAME 1 #define PHP3_MSQL_FIELD_TABLE 2 #define PHP3_MSQL_FIELD_LEN 3 --- 1289,1296 ---- msqlFieldSeek(msql_result,offset->value.lval); RETURN_TRUE; } + /* }}} */ #define PHP3_MSQL_FIELD_NAME 1 #define PHP3_MSQL_FIELD_TABLE 2 #define PHP3_MSQL_FIELD_LEN 3 *************** *** 1343,1376 **** RETURN_FALSE; } } - DLEXPORT void php3_msql_field_name(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_NAME); } DLEXPORT void php3_msql_field_table(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_TABLE); } DLEXPORT void php3_msql_field_len(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_LEN); } DLEXPORT void php3_msql_field_type(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_TYPE); } DLEXPORT void php3_msql_field_flags(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_FLAGS); } DLEXPORT void php3_msql_free_result(INTERNAL_FUNCTION_PARAMETERS) { pval *result; --- 1386,1435 ---- RETURN_FALSE; } } + /* {{{ proto string msql_field_name(int result, int field_index) + Get the name of the specified field in a result */ DLEXPORT void php3_msql_field_name(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_NAME); } + /* }}} */ + /* {{{ proto string msql_field_table(int result, int field_offset) + Get name of the table the specified field is in */ DLEXPORT void php3_msql_field_table(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_TABLE); } + /* }}} */ + /* {{{ proto int msql_field_len(int result, int field_offet) + Returns the length of the specified field */ DLEXPORT void php3_msql_field_len(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_LEN); } + /* }}} */ + /* {{{ proto string msql_field_type(int result, int field_offset) + Get the type of the specified field in a result */ DLEXPORT void php3_msql_field_type(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_TYPE); } + /* }}} */ + /* {{{ proto string msql_field_flags(int result, int field_offset) + Get the flags associated with the specified field in a result */ DLEXPORT void php3_msql_field_flags(INTERNAL_FUNCTION_PARAMETERS) { php3_msql_field_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP3_MSQL_FIELD_FLAGS); } + /* }}} */ + /* {{{ proto int msql_free_result(int result) + Free result memory */ DLEXPORT void php3_msql_free_result(INTERNAL_FUNCTION_PARAMETERS) { pval *result; *************** *** 1395,1400 **** --- 1454,1460 ---- php3_list_delete(result->value.lval); RETURN_TRUE; } + /* }}} */ #endif -- 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