CVS update: php3/functions

Date: Sunday December 27, 1998 @ 16:12 Author: rasmus Update of /repository/php3/functions In directory asf:/home/rasmus/php3/functions Modified Files: unified_odbc.c Log Message: Add return types to odbc prototypes Index: php3/functions/unified_odbc.c diff -c php3/functions/unified_odbc.c:1.96 php3/functions/unified_odbc.c:1.97 *** php3/functions/unified_odbc.c:1.96 Fri Dec 18 14:25:51 1998 --- php3/functions/unified_odbc.c Sun Dec 27 16:12:29 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: unified_odbc.c,v 1.96 1998/12/18 19:25:51 swilliam Exp $ */ /* This file is based on the Adabas D extension. * Adabas D will no longer be supported as separate module. --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: unified_odbc.c,v 1.97 1998/12/27 21:12:29 rasmus Exp $ */ /* This file is based on the Adabas D extension. * Adabas D will no longer be supported as separate module. *************** *** 536,542 **** } /* Main User Functions */ ! /* {{{ proto odbc_close_all(void) Close all ODBC connections */ UODBC_FUNCTION(close_all) { --- 536,542 ---- } /* Main User Functions */ ! /* {{{ proto void odbc_close_all(void) Close all ODBC connections */ UODBC_FUNCTION(close_all) { *************** *** 588,594 **** RETURN_TRUE } ! /* {{{ proto odbc_binmode(int result_id, int mode) Handle binary column data */ UODBC_FUNCTION(binmode) { --- 588,594 ---- RETURN_TRUE } ! /* {{{ proto int odbc_binmode(int result_id, int mode) Handle binary column data */ UODBC_FUNCTION(binmode) { *************** *** 596,602 **** } /* }}} */ ! /* {{{ proto odbc_longreadlen(int result_id, int length) Handle LONG columns */ UODBC_FUNCTION(longreadlen) { --- 596,602 ---- } /* }}} */ ! /* {{{ proto int odbc_longreadlen(int result_id, int length) Handle LONG columns */ UODBC_FUNCTION(longreadlen) { *************** *** 663,669 **** return 1; } ! /* {{{ proto odbc_prepare(int connection_id, string query) Prepares a statement for execution */ UODBC_FUNCTION(prepare) { --- 663,669 ---- return 1; } ! /* {{{ proto int odbc_prepare(int connection_id, string query) Prepares a statement for execution */ UODBC_FUNCTION(prepare) { *************** *** 737,743 **** /* * Execute prepared SQL statement. Supports only input parameters. */ ! /* {{{ proto odbc_execute(int result_id [, array parameters_array]) Execute a prepared statement */ extern UODBC_FUNCTION(execute) { --- 737,743 ---- /* * Execute prepared SQL statement. Supports only input parameters. */ ! /* {{{ proto int odbc_execute(int result_id [, array parameters_array]) Execute a prepared statement */ extern UODBC_FUNCTION(execute) { *************** *** 905,911 **** /* odbc_cursor simply returns a cursor name for the given stmt * Adabas automagically generates cursor names, other drivers may not */ ! /* {{{ proto odbc_cursor(int result_id) Get cursor name */ UODBC_FUNCTION(cursor) { --- 905,911 ---- /* odbc_cursor simply returns a cursor name for the given stmt * Adabas automagically generates cursor names, other drivers may not */ ! /* {{{ proto string odbc_cursor(int result_id) Get cursor name */ UODBC_FUNCTION(cursor) { *************** *** 972,978 **** } /* }}} */ ! /* {{{ proto odbc_exec(int connection_id, string query) Prepare and execute an SQL statement */ UODBC_FUNCTION(exec) { --- 972,978 ---- } /* }}} */ ! /* {{{ proto int odbc_exec(int connection_id, string query) Prepare and execute an SQL statement */ UODBC_FUNCTION(exec) { *************** *** 1071,1077 **** } /* }}} */ ! /* {{{ proto odbc_fetch_into(int result_id [, int rownumber], array result_array) Fetch one result row into an array */ UODBC_FUNCTION(fetch_into) { --- 1071,1077 ---- } /* }}} */ ! /* {{{ proto int odbc_fetch_into(int result_id [, int rownumber], array result_array) Fetch one result row into an array */ UODBC_FUNCTION(fetch_into) { *************** *** 1221,1226 **** --- 1221,1228 ---- /* }}} */ #if HAVE_SOLID + /* {{{ proto int solid_fetch_prev(int result_id) + ?? */ void php3_solid_fetch_prev(INTERNAL_FUNCTION_PARAMETERS) { int res_ind; *************** *** 1253,1261 **** RETURN_TRUE; } #endif ! /* {{{ proto odbc_fetch_row(int result_id [, int row_number]) Fetch a row */ UODBC_FUNCTION(fetch_row) { --- 1255,1264 ---- RETURN_TRUE; } + /* }}} */ #endif ! /* {{{ proto int odbc_fetch_row(int result_id [, int row_number]) Fetch a row */ UODBC_FUNCTION(fetch_row) { *************** *** 1317,1323 **** } /* }}} */ ! /* {{{ proto odbc_result(int result_id, mixed field) Get result data */ UODBC_FUNCTION(result) { --- 1320,1326 ---- } /* }}} */ ! /* {{{ proto mixed odbc_result(int result_id, mixed field) Get result data */ UODBC_FUNCTION(result) { *************** *** 1503,1509 **** } /* }}} */ ! /* {{{ proto odbc_result_all(int result_id [, string format]) Print result as HTML table */ UODBC_FUNCTION(result_all) { --- 1506,1512 ---- } /* }}} */ ! /* {{{ proto int odbc_result_all(int result_id [, string format]) Print result as HTML table */ UODBC_FUNCTION(result_all) { *************** *** 1639,1645 **** } /* }}} */ ! /* {{{ proto odbc_free_result(int result_id) Free resources associated with a result */ UODBC_FUNCTION(free_result) { --- 1642,1648 ---- } /* }}} */ ! /* {{{ proto int odbc_free_result(int result_id) Free resources associated with a result */ UODBC_FUNCTION(free_result) { *************** *** 1654,1660 **** } /* }}} */ ! /* {{{ proto odbc_connect(string DSN, string user, string password [, int cursor_option]) Connect to a datasource */ UODBC_FUNCTION(connect) { --- 1657,1663 ---- } /* }}} */ ! /* {{{ proto int odbc_connect(string DSN, string user, string password [, int cursor_option]) Connect to a datasource */ UODBC_FUNCTION(connect) { *************** *** 1662,1668 **** } /* }}} */ ! /* {{{ proto odbc_connect(string DSN, string user, string password [, int cursor_option]) Establish a persistant connection to a datasource */ UODBC_FUNCTION(pconnect) { --- 1665,1671 ---- } /* }}} */ ! /* {{{ proto int odbc_pconnect(string DSN, string user, string password [, int cursor_option]) Establish a persistant connection to a datasource */ UODBC_FUNCTION(pconnect) { *************** *** 1954,1960 **** return_value->type = IS_LONG; } ! /* {{{ proto odbc_close(int connection_id) Close an ODBC connection */ UODBC_FUNCTION(close) { --- 1957,1963 ---- return_value->type = IS_LONG; } ! /* {{{ proto void odbc_close(int connection_id) Close an ODBC connection */ UODBC_FUNCTION(close) { *************** *** 1978,1984 **** } /* }}} */ ! /* {{{ proto odbc_num_rows(int result_id) Get number of rows in a result */ UODBC_FUNCTION(num_rows) { --- 1981,1987 ---- } /* }}} */ ! /* {{{ proto int odbc_num_rows(int result_id) Get number of rows in a result */ UODBC_FUNCTION(num_rows) { *************** *** 2001,2007 **** } /* }}} */ ! /* {{{ proto odbc_num_fields(int result_id) Get number of columns in a result */ UODBC_FUNCTION(num_fields) { --- 2004,2010 ---- } /* }}} */ ! /* {{{ proto int odbc_num_fields(int result_id) Get number of columns in a result */ UODBC_FUNCTION(num_fields) { *************** *** 2021,2027 **** } /* }}} */ ! /* {{{ proto odbc_field_name(int result_id, int field_number) Get a column name */ UODBC_FUNCTION(field_name) { --- 2024,2030 ---- } /* }}} */ ! /* {{{ proto string odbc_field_name(int result_id, int field_number) Get a column name */ UODBC_FUNCTION(field_name) { *************** *** 2058,2064 **** } /* }}} */ ! /* {{{ proto odbc_field_type(int result_id, int field_number) Get the datatype of a column */ UODBC_FUNCTION(field_type) { --- 2061,2067 ---- } /* }}} */ ! /* {{{ proto string odbc_field_type(int result_id, int field_number) Get the datatype of a column */ UODBC_FUNCTION(field_type) { *************** *** 2094,2100 **** } /* }}} */ ! /* {{{ proto odbc_field_len(int result_id, int field_number) Get the length of a column */ UODBC_FUNCTION(field_len) { --- 2097,2103 ---- } /* }}} */ ! /* {{{ proto int odbc_field_len(int result_id, int field_number) Get the length of a column */ UODBC_FUNCTION(field_len) { *************** *** 2129,2135 **** } /* }}} */ ! /* {{{ proto odbc_field_num(int result_id, string field_name) Return column number */ UODBC_FUNCTION(field_num) { --- 2132,2138 ---- } /* }}} */ ! /* {{{ proto int odbc_field_num(int result_id, string field_name) Return column number */ UODBC_FUNCTION(field_num) { *************** *** 2166,2172 **** } /* }}} */ ! /* {{{ proto odbc_autocommit(int connection_id, int OnOff) Toggle autocommit mode */ UODBC_FUNCTION(autocommit) { --- 2169,2175 ---- } /* }}} */ ! /* {{{ proto int odbc_autocommit(int connection_id, int OnOff) Toggle autocommit mode */ UODBC_FUNCTION(autocommit) { *************** *** 2245,2251 **** RETURN_TRUE; } ! /* {{{ proto odbc_commit(int connection_id) Commit an ODBC transaction */ UODBC_FUNCTION(commit) { --- 2248,2254 ---- RETURN_TRUE; } ! /* {{{ proto int odbc_commit(int connection_id) Commit an ODBC transaction */ UODBC_FUNCTION(commit) { *************** *** 2253,2259 **** } /* }}} */ ! /* {{{ proto odbc_rollback(int connection_id) Rollback a transaction */ UODBC_FUNCTION(rollback) { --- 2256,2262 ---- } /* }}} */ ! /* {{{ proto int odbc_rollback(int connection_id) Rollback a transaction */ UODBC_FUNCTION(rollback) { *************** *** 2261,2267 **** } /* }}} */ ! /* {{{ proto odbc_setoption(??) ?? */ UODBC_FUNCTION(setoption) { --- 2264,2270 ---- } /* }}} */ ! /* {{{ proto int odbc_setoption(??) ?? */ UODBC_FUNCTION(setoption) { -- 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