andrey Mon Jun 16 12:36:41 2003 EDT
Modified files:
/php4/ext/msql php_msql.c
/php4/ext/ncurses ncurses_functions.c
/php4/ext/notes php_notes.c
/php4/ext/odbc birdstep.c php_odbc.c
Log:
proto fixes
#my head hurts now. no more fixes today ;)
Index: php4/ext/msql/php_msql.c
diff -u php4/ext/msql/php_msql.c:1.54 php4/ext/msql/php_msql.c:1.55
--- php4/ext/msql/php_msql.c:1.54 Tue Jun 10 16:03:32 2003
+++ php4/ext/msql/php_msql.c Mon Jun 16 12:36:41 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_msql.c,v 1.54 2003/06/10 20:03:32 imajes Exp $ */
+/* $Id: php_msql.c,v 1.55 2003/06/16 16:36:41 andrey Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -397,7 +397,7 @@
}
/* }}} */
-/* {{{ proto int msql_close([int link_identifier])
+/* {{{ proto bool msql_close([resource link_identifier])
Close an mSQL connection */
PHP_FUNCTION(msql_close)
{
@@ -436,7 +436,7 @@
}
/* }}} */
-/* {{{ proto int msql_select_db(string database_name [, int link_identifier])
+/* {{{ proto bool msql_select_db(string database_name [, resource link_identifier])
Select an mSQL database */
PHP_FUNCTION(msql_select_db)
{
@@ -475,7 +475,7 @@
}
/* }}} */
-/* {{{ proto int msql_create_db(string database_name [, int link_identifier])
+/* {{{ proto bool msql_create_db(string database_name [, resource link_identifier])
Create an mSQL database */
PHP_FUNCTION(msql_create_db)
{
@@ -512,7 +512,7 @@
}
/* }}} */
-/* {{{ proto int msql_drop_db(string database_name [, int link_identifier])
+/* {{{ proto bool msql_drop_db(string database_name [, resource link_identifier])
Drop (delete) an mSQL database */
PHP_FUNCTION(msql_drop_db)
{
@@ -549,7 +549,7 @@
}
/* }}} */
-/* {{{ proto int msql_query(string query [, int link_identifier])
+/* {{{ proto resource msql_query(string query [, resource link_identifier])
Send an SQL query to mSQL */
PHP_FUNCTION(msql_query)
{
@@ -586,7 +586,7 @@
}
/* }}} */
-/* {{{ proto int msql_db_query(string database_name, string query [, int
link_identifier])
+/* {{{ proto resource msql_db_query(string database_name, string query [, resource
link_identifier])
Send an SQL query to mSQL */
PHP_FUNCTION(msql_db_query)
{
@@ -628,7 +628,7 @@
}
/* }}} */
-/* {{{ proto int msql_list_dbs([int link_identifier])
+/* {{{ proto resource msql_list_dbs([resource link_identifier])
List databases available on an mSQL server */
PHP_FUNCTION(msql_list_dbs)
{
@@ -662,7 +662,7 @@
}
/* }}} */
-/* {{{ proto int msql_list_tables(string database_name [, int link_identifier])
+/* {{{ proto resource msql_list_tables(string database_name [, resource
link_identifier])
List tables in an mSQL database */
PHP_FUNCTION(msql_list_tables)
{
@@ -703,7 +703,7 @@
}
/* }}} */
-/* {{{ proto int msql_list_fields(string database_name, string table_name [, int
link_identifier])
+/* {{{ proto resource msql_list_fields(string database_name, string table_name [,
resource link_identifier])
List mSQL result fields */
PHP_FUNCTION(msql_list_fields)
{
@@ -745,7 +745,7 @@
}
/* }}} */
-/* {{{ proto string msql_error([int link_identifier])
+/* {{{ proto string msql_error(void)
Returns the text of the error message from previous mSQL operation */
PHP_FUNCTION(msql_error)
{
@@ -756,7 +756,7 @@
}
/* }}} */
-/* {{{ proto int msql_result(int query, int row [, mixed field])
+/* {{{ proto string msql_result(int query, int row [, mixed field])
Get result data */
PHP_FUNCTION(msql_result)
{
@@ -857,7 +857,7 @@
}
/* }}} */
-/* {{{ proto int msql_num_rows(int query)
+/* {{{ proto int msql_num_rows(resource query)
Get number of rows in a result */
PHP_FUNCTION(msql_num_rows)
{
@@ -874,7 +874,7 @@
}
/* }}} */
-/* {{{ proto int msql_num_fields(int query)
+/* {{{ proto int msql_num_fields(resource query)
Get number of fields in a result */
PHP_FUNCTION(msql_num_fields)
{
@@ -966,7 +966,7 @@
}
/* }}} */
-/* {{{ proto array msql_fetch_row(int query)
+/* {{{ proto array msql_fetch_row(resource query)
Get a result row as an enumerated array */
PHP_FUNCTION(msql_fetch_row)
{
@@ -974,7 +974,7 @@
}
/* }}} */
-/* {{{ proto object msql_fetch_object(int query [, int result_type])
+/* {{{ proto object msql_fetch_object(resource query [, resource result_type])
Fetch a result row as an object */
PHP_FUNCTION(msql_fetch_object)
{
@@ -985,7 +985,7 @@
}
/* }}} */
-/* {{{ proto array msql_fetch_array(int query [, int result_type])
+/* {{{ proto array msql_fetch_array(resource query [, int result_type])
Fetch a result row as an associative array */
PHP_FUNCTION(msql_fetch_array)
{
@@ -993,7 +993,7 @@
}
/* }}} */
-/* {{{ proto int msql_data_seek(int query, int row_number)
+/* {{{ proto bool msql_data_seek(resource query, int row_number)
Move internal result pointer */
PHP_FUNCTION(msql_data_seek)
{
@@ -1059,7 +1059,7 @@
}
/* }}} */
-/* {{{ proto object msql_fetch_field(int query [, int field_offset])
+/* {{{ proto object msql_fetch_field(resource query [, int field_offset])
Get column information from a result and return as an object */
PHP_FUNCTION(msql_fetch_field)
{
@@ -1110,7 +1110,7 @@
}
/* }}} */
-/* {{{ proto int msql_field_seek(int query, int field_offset)
+/* {{{ proto bool msql_field_seek(resource query, int field_offset)
Set result pointer to a specific field offset */
PHP_FUNCTION(msql_field_seek)
{
@@ -1231,7 +1231,7 @@
}
/* }}} */
-/* {{{ proto string msql_field_name(int query, int field_index)
+/* {{{ proto string msql_field_name(resource query, int field_index)
Get the name of the specified field in a result */
PHP_FUNCTION(msql_field_name)
{
@@ -1239,7 +1239,7 @@
}
/* }}} */
-/* {{{ proto string msql_field_table(int query, int field_offset)
+/* {{{ proto string msql_field_table(resource query, int field_offset)
Get name of the table the specified field is in */
PHP_FUNCTION(msql_field_table)
{
@@ -1255,7 +1255,7 @@
}
/* }}} */
-/* {{{ proto string msql_field_type(int query, int field_offset)
+/* {{{ proto string msql_field_type(resource query, int field_offset)
Get the type of the specified field in a result */
PHP_FUNCTION(msql_field_type)
{
@@ -1263,7 +1263,7 @@
}
/* }}} */
-/* {{{ proto string msql_field_flags(int query, int field_offset)
+/* {{{ proto string msql_field_flags(resource query, int field_offset)
Get the flags associated with the specified field in a result */
PHP_FUNCTION(msql_field_flags)
{
@@ -1271,7 +1271,7 @@
}
/* }}} */
-/* {{{ proto int msql_free_result(int query)
+/* {{{ proto bool msql_free_result(resource query)
Free result memory */
PHP_FUNCTION(msql_free_result)
{
@@ -1289,7 +1289,7 @@
}
/* }}} */
-/* {{{ proto int msql_affected_rows(int query)
+/* {{{ proto int msql_affected_rows(resource query)
Return number of affected rows */
PHP_FUNCTION(msql_affected_rows)
{
Index: php4/ext/ncurses/ncurses_functions.c
diff -u php4/ext/ncurses/ncurses_functions.c:1.41
php4/ext/ncurses/ncurses_functions.c:1.42
--- php4/ext/ncurses/ncurses_functions.c:1.41 Sat Jun 14 09:31:51 2003
+++ php4/ext/ncurses/ncurses_functions.c Mon Jun 16 12:36:41 2003
@@ -431,7 +431,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_def_prog_mode(void)
+/* {{{ proto int ncurses_def_prog_mode(void)
Saves terminals (program) mode */
PHP_FUNCTION(ncurses_def_prog_mode)
{
@@ -440,7 +440,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_def_shell_mode(void)
+/* {{{ proto int ncurses_def_shell_mode(void)
Saves terminal (shell) mode*/
PHP_FUNCTION(ncurses_def_shell_mode)
{
@@ -449,7 +449,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_delch(void)
+/* {{{ proto int ncurses_delch(void)
Deletes character at current position, move rest of line left */
PHP_FUNCTION(ncurses_delch)
{
@@ -458,7 +458,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_deleteln(void)
+/* {{{ proto int ncurses_deleteln(void)
Deletes line at current position, move rest of screen up */
PHP_FUNCTION(ncurses_deleteln)
{
@@ -467,7 +467,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_doupdate(void)
+/* {{{ proto int ncurses_doupdate(void)
Writes all prepared refreshes to terminal */
PHP_FUNCTION(ncurses_doupdate)
{
@@ -476,7 +476,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_echo(void)
+/* {{{ proto int ncurses_echo(void)
Activates keyboard input echo */
PHP_FUNCTION(ncurses_echo)
{
@@ -485,7 +485,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_erase(void)
+/* {{{ proto int ncurses_erase(void)
Erases terminal screen */
PHP_FUNCTION(ncurses_erase)
{
@@ -508,7 +508,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_flash(void)
+/* {{{ proto int ncurses_flash(void)
Flashes terminal screen (visual bell) */
PHP_FUNCTION(ncurses_flash)
{
@@ -517,7 +517,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_flushinp(void)
+/* {{{ proto int ncurses_flushinp(void)
Flushes keyboard input buffer */
PHP_FUNCTION(ncurses_flushinp)
{
@@ -526,7 +526,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_has_ic(void)
+/* {{{ proto int ncurses_has_ic(void)
Checks for insert- and delete-capabilities */
PHP_FUNCTION(ncurses_has_ic)
{
@@ -536,7 +536,7 @@
/* }}} */
-/* {{{ proto bool ncurses_has_il(void)
+/* {{{ proto int ncurses_has_il(void)
Checks for line insert- and delete-capabilities */
PHP_FUNCTION(ncurses_has_il)
{
@@ -559,7 +559,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_insertln(void)
+/* {{{ proto int ncurses_insertln(void)
Inserts a line, move rest of screen down */
PHP_FUNCTION(ncurses_insertln)
{
@@ -568,7 +568,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_isendwin(void)
+/* {{{ proto int ncurses_isendwin(void)
Ncurses is in endwin mode, normal screen output may be performed */
PHP_FUNCTION(ncurses_isendwin)
{
@@ -591,7 +591,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_nl(void)
+/* {{{ proto int ncurses_nl(void)
Translates newline and carriage return / line feed */
PHP_FUNCTION(ncurses_nl)
{
@@ -600,7 +600,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_nocbreak(void)
+/* {{{ proto int ncurses_nocbreak(void)
Switches terminal to cooked mode */
PHP_FUNCTION(ncurses_nocbreak)
{
@@ -609,7 +609,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_noecho(void)
+/* {{{ proto int ncurses_noecho(void)
Switches off keyboard input echo */
PHP_FUNCTION(ncurses_noecho)
{
@@ -618,7 +618,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_nonl(void)
+/* {{{ proto int ncurses_nonl(void)
Do not ranslate newline and carriage return / line feed */
PHP_FUNCTION(ncurses_nonl)
{
@@ -635,7 +635,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_raw(void)
+/* {{{ proto int ncurses_raw(void)
Switches terminal into raw mode */
PHP_FUNCTION(ncurses_raw)
{
@@ -644,7 +644,7 @@
}
/* }}} */
-/* {{{ proto long ncurses_meta(resource window, bool 8bit)
+/* {{{ proto int ncurses_meta(resource window, bool 8bit)
Enables/Disable 8-bit meta key information */
PHP_FUNCTION(ncurses_meta)
{
@@ -662,7 +662,7 @@
}
/* }}} */
-/* {{{ proto long ncurses_werase(resource window)
+/* {{{ proto int ncurses_werase(resource window)
Erase window contents */
PHP_FUNCTION(ncurses_werase)
{
@@ -680,7 +680,7 @@
/* }}} */
-/* {{{ proto bool ncurses_resetty(void)
+/* {{{ proto int ncurses_resetty(void)
Restores saved terminal state */
PHP_FUNCTION(ncurses_resetty)
{
@@ -689,7 +689,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_savetty(void)
+/* {{{ proto int ncurses_savetty(void)
Saves terminal state */
PHP_FUNCTION(ncurses_savetty)
{
@@ -698,7 +698,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_termattrs(void)
+/* {{{ proto int ncurses_termattrs(void)
Returns a logical OR of all attribute flags supported by terminal */
PHP_FUNCTION(ncurses_termattrs)
{
@@ -707,7 +707,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_use_default_colors(void)
+/* {{{ proto int ncurses_use_default_colors(void)
Assigns terminal default colors to color id -1 */
PHP_FUNCTION(ncurses_use_default_colors)
{
@@ -716,7 +716,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_slk_attr(void)
+/* {{{ proto int ncurses_slk_attr(void)
Returns current soft label keys attribute */
PHP_FUNCTION(ncurses_slk_attr)
{
@@ -725,7 +725,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_slk_clear(void)
+/* {{{ proto int ncurses_slk_clear(void)
Clears soft label keys from screen */
PHP_FUNCTION(ncurses_slk_clear)
{
@@ -734,7 +734,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_slk_noutrefresh(void)
+/* {{{ proto int ncurses_slk_noutrefresh(void)
Copies soft label keys to virtual screen */
PHP_FUNCTION(ncurses_slk_noutrefresh)
{
@@ -743,7 +743,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_slk_refresh(void)
+/* {{{ proto int ncurses_slk_refresh(void)
Copies soft label keys to screen */
PHP_FUNCTION(ncurses_slk_refresh)
{
@@ -752,7 +752,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_slk_restore(void)
+/* {{{ proto int ncurses_slk_restore(void)
Restores soft label keys */
PHP_FUNCTION(ncurses_slk_restore)
{
@@ -761,7 +761,7 @@
}
/* }}} */
-/* {{{ proto bool ncurses_slk_touch(void)
+/* {{{ proto int ncurses_slk_touch(void)
Forces output when ncurses_slk_noutrefresh is performed */
PHP_FUNCTION(ncurses_slk_touch)
{
@@ -1128,7 +1128,7 @@
}
/* }}} */
-/* {{{ proto int ncurses_filter(void)
+/* {{{ proto void ncurses_filter(void)
*/
PHP_FUNCTION(ncurses_filter)
{
@@ -1146,7 +1146,7 @@
}
/* }}} */
-/* {{{ proto int ncurses_qiflush(void)
+/* {{{ proto void ncurses_qiflush(void)
Flushes on signal characters */
PHP_FUNCTION(ncurses_qiflush)
{
@@ -1169,7 +1169,7 @@
}
/* }}} */
-/* {{{ proto void ncurses_use_env(bool flag)
+/* {{{ proto void ncurses_use_env(int flag)
Controls use of environment information about terminal size */
PHP_FUNCTION(ncurses_use_env)
{
@@ -1709,7 +1709,7 @@
}
/* }}} */
-/* {{{ proto int ncurses_keyok(int keycode, bool enable)
+/* {{{ proto int ncurses_keyok(int keycode, int enable)
Enables or disable a keycode */
PHP_FUNCTION(ncurses_keyok)
{
@@ -1811,7 +1811,7 @@
/* }}} */
/* {{{ proto bool ncurses_getmouse(array &mevent)
- Reads mouse event from queue */
+ Reads mouse event from queue. The content of mevent is cleared before new data is
added. */
PHP_FUNCTION(ncurses_getmouse)
{
zval *arg;
@@ -2230,7 +2230,7 @@
}
/* }}} */
-/* {{{ proto int ncurses_del_panel(resource panel)
+/* {{{ proto bool ncurses_del_panel(resource panel)
Remove panel from the stack and delete it (but not the associated window) */
PHP_FUNCTION(ncurses_del_panel)
{
@@ -2356,7 +2356,7 @@
}
/* }}} */
-/* {{{ proto int ncurses_panel_above(resource panel)
+/* {{{ proto resource ncurses_panel_above(resource panel)
Returns the panel above panel. If panel is null, returns the bottom panel in the
stack */
PHP_FUNCTION(ncurses_panel_above)
{
@@ -2385,7 +2385,7 @@
}
/* }}} */
-/* {{{ proto int ncurses_panel_below(resource panel)
+/* {{{ proto resource ncurses_panel_below(resource panel)
Returns the panel below panel. If panel is null, returns the top panel in the
stack */
PHP_FUNCTION(ncurses_panel_below)
{
@@ -2413,7 +2413,7 @@
}
/* }}} */
-/* {{{ proto int ncurses_panel_window(resource panel)
+/* {{{ proto resource ncurses_panel_window(resource panel)
Returns the window associated with panel */
PHP_FUNCTION(ncurses_panel_window)
{
Index: php4/ext/notes/php_notes.c
diff -u php4/ext/notes/php_notes.c:1.18 php4/ext/notes/php_notes.c:1.19
--- php4/ext/notes/php_notes.c:1.18 Tue Jun 10 16:03:33 2003
+++ php4/ext/notes/php_notes.c Mon Jun 16 12:36:41 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_notes.c,v 1.18 2003/06/10 20:03:33 imajes Exp $ */
+/* $Id: php_notes.c,v 1.19 2003/06/16 16:36:41 andrey Exp $ */
#ifdef COMPILE_DL_NOTES
#define HAVE_NOTES 1
@@ -242,7 +242,7 @@
}
/* }}} */
-/* {{{ proto string notes_version(string database_name)
+/* {{{ proto float notes_version(string database_name)
Gets the Lotus Notes version */
PHP_FUNCTION(notes_version)
{
@@ -315,7 +315,7 @@
}
/* }}} */
-/* {{{ proto string notes_create_note(string database_name, string form_name)
+/* {{{ proto bool notes_create_note(string database_name, string form_name)
Creates a note using form form_name */
PHP_FUNCTION(notes_create_note)
{
@@ -439,7 +439,7 @@
NOTEID UndoID);
-/* {{{ proto string notes_mark_read(string database_name, string user_name, string
note_id)
+/* {{{ proto bool notes_mark_read(string database_name, string user_name, string
note_id)
Marks a note_id as read for the User user_name. Note: user_name must be fully
distinguished user name */
PHP_FUNCTION(notes_mark_read)
{
@@ -853,7 +853,7 @@
return (error);
}
-/* {{{ proto string notes_unread(string database_name, string user_name)
+/* {{{ proto array notes_unread(string database_name, string user_name)
Returns the unread note id's for the current User user_name. Note: user_name must
be fully distinguished user name */
PHP_FUNCTION(notes_unread)
{
@@ -1404,7 +1404,7 @@
}
/* }}} */
-/* {{{ proto bool notes_find_note(string database_name, string name [, string type])
+/* {{{ proto int notes_find_note(string database_name, string name [, string type])
Returns a note id found in database_name */
/*
Specify the name of the note. Leaving type blank
@@ -1696,7 +1696,7 @@
}
/* }}} */
-/* {{{ proto string notes_search(string database_name, string keywords)
+/* {{{ proto array notes_search(string database_name, string keywords)
Finds notes that match keywords in database_name. The note(s) that are returned
must be converted to base 16. Example base_convert($note_id, "10", "16") */
STATUS LNPUBLIC file_action (void *, SEARCH_MATCH *, ITEM_TABLE *);
@@ -1938,7 +1938,7 @@
}
/* }}} */
-/* {{{ proto string notes_copy_db(string from_database_name, string to_database_name
[, string title])
+/* {{{ proto bool notes_copy_db(string from_database_name, string to_database_name [,
string title])
Creates a note using form form_name */
PHP_FUNCTION(notes_copy_db)
{
Index: php4/ext/odbc/birdstep.c
diff -u php4/ext/odbc/birdstep.c:1.7 php4/ext/odbc/birdstep.c:1.8
--- php4/ext/odbc/birdstep.c:1.7 Tue Jun 10 16:03:33 2003
+++ php4/ext/odbc/birdstep.c Mon Jun 16 12:36:41 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: birdstep.c,v 1.7 2003/06/10 20:03:33 imajes Exp $ */
+/* $Id: birdstep.c,v 1.8 2003/06/16 16:36:41 andrey Exp $ */
/*
* TODO:
@@ -226,7 +226,7 @@
/* Users functions */
-/* {{{ proto int birdstep_connect(string server, string user, sting pass)
+/* {{{ proto int birdstep_connect(string server, string user, string pass)
*/
PHP_FUNCTION(birdstep_connect)
{
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.165 php4/ext/odbc/php_odbc.c:1.166
--- php4/ext/odbc/php_odbc.c:1.165 Fri Jun 13 23:35:16 2003
+++ php4/ext/odbc/php_odbc.c Mon Jun 16 12:36:41 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.165 2003/06/14 03:35:16 fmk Exp $ */
+/* $Id: php_odbc.c,v 1.166 2003/06/16 16:36:41 andrey Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -807,7 +807,7 @@
}
/* }}} */
-/* {{{ proto int odbc_binmode(int result_id, int mode)
+/* {{{ proto bool odbc_binmode(int result_id, int mode)
Handle binary column data */
PHP_FUNCTION(odbc_binmode)
{
@@ -815,7 +815,7 @@
}
/* }}} */
-/* {{{ proto int odbc_longreadlen(int result_id, int length)
+/* {{{ proto bool odbc_longreadlen(int result_id, int length)
Handle LONG columns */
PHP_FUNCTION(odbc_longreadlen)
{
@@ -823,7 +823,7 @@
}
/* }}} */
-/* {{{ proto int odbc_prepare(int connection_id, string query)
+/* {{{ proto resource odbc_prepare(resource connection_id, string query)
Prepares a statement for execution */
PHP_FUNCTION(odbc_prepare)
{
@@ -919,7 +919,7 @@
* Execute prepared SQL statement. Supports only input parameters.
*/
-/* {{{ proto int odbc_execute(int result_id [, array parameters_array])
+/* {{{ proto bool odbc_execute(resource result_id [, array parameters_array])
Execute a prepared statement */
PHP_FUNCTION(odbc_execute)
{
@@ -1115,7 +1115,7 @@
}
/* }}} */
-/* {{{ proto string odbc_cursor(int result_id)
+/* {{{ proto string odbc_cursor(resource result_id)
Get cursor name */
PHP_FUNCTION(odbc_cursor)
{
@@ -1172,7 +1172,7 @@
/* }}} */
#ifdef HAVE_SQLDATASOURCES
-/* {{{ proto array odbc_data_source(int connection_id, int fetch_type)
+/* {{{ proto array odbc_data_source(resource connection_id, int fetch_type)
Return information about the currently connected data source */
PHP_FUNCTION(odbc_data_source)
{
@@ -1234,7 +1234,7 @@
/* }}} */
#endif /* HAVE_SQLDATASOURCES *
-/* {{{ proto int odbc_exec(int connection_id, string query [, int flags])
+/* {{{ proto resource odbc_exec(resource connection_id, string query [, int flags])
Prepare and execute an SQL statement */
/* XXX Use flags */
PHP_FUNCTION(odbc_exec)
@@ -1488,7 +1488,7 @@
/* }}} */
#endif
-/* {{{ proto int odbc_fetch_into(int result_id, array result_array, [, int rownumber])
+/* {{{ proto int odbc_fetch_into(resource result_id, array result_array, [, int
rownumber])
Fetch one result row into an array */
PHP_FUNCTION(odbc_fetch_into)
{
@@ -1616,7 +1616,8 @@
}
/* }}} */
-/* {{{ solid_fetch_prev */
+/* {{{ proto bool solid_fetch_prev(resource result_id)
+ */
#if defined(HAVE_SOLID) || defined(HAVE_SOLID_30) || defined(HAVE_SOLID_35)
PHP_FUNCTION(solid_fetch_prev)
{
@@ -1646,7 +1647,7 @@
#endif
/* }}} */
-/* {{{ proto int odbc_fetch_row(int result_id [, int row_number])
+/* {{{ proto bool odbc_fetch_row(resource result_id [, int row_number])
Fetch a row */
PHP_FUNCTION(odbc_fetch_row)
{
@@ -1707,7 +1708,7 @@
}
/* }}} */
-/* {{{ proto string odbc_result(int result_id, mixed field)
+/* {{{ proto mixed odbc_result(resource result_id, mixed field)
Get result data */
PHP_FUNCTION(odbc_result)
{
@@ -1880,7 +1881,7 @@
}
/* }}} */
-/* {{{ proto int odbc_result_all(int result_id [, string format])
+/* {{{ proto int odbc_result_all(resource result_id [, string format])
Print result as HTML table */
PHP_FUNCTION(odbc_result_all)
{
@@ -2003,7 +2004,7 @@
}
/* }}} */
-/* {{{ proto int odbc_free_result(int result_id)
+/* {{{ proto bool odbc_free_result(resource result_id)
Free resources associated with a result */
PHP_FUNCTION(odbc_free_result)
{
@@ -2032,7 +2033,7 @@
}
/* }}} */
-/* {{{ proto int odbc_connect(string DSN, string user, string password [, int
cursor_option])
+/* {{{ proto resource odbc_connect(string DSN, string user, string password [, int
cursor_option])
Connect to a datasource */
PHP_FUNCTION(odbc_connect)
{
@@ -2040,7 +2041,7 @@
}
/* }}} */
-/* {{{ proto int odbc_pconnect(string DSN, string user, string password [, int
cursor_option])
+/* {{{ proto resource odbc_pconnect(string DSN, string user, string password [, int
cursor_option])
Establish a persistent connection to a datasource */
PHP_FUNCTION(odbc_pconnect)
{
@@ -2326,7 +2327,7 @@
}
/* }}} */
-/* {{{ proto void odbc_close(int connection_id)
+/* {{{ proto void odbc_close(resource connection_id)
Close an ODBC connection */
PHP_FUNCTION(odbc_close)
{
@@ -2370,7 +2371,7 @@
}
/* }}} */
-/* {{{ proto int odbc_num_rows(int result_id)
+/* {{{ proto int odbc_num_rows(resource result_id)
Get number of rows in a result */
PHP_FUNCTION(odbc_num_rows)
{
@@ -2388,7 +2389,7 @@
/* }}} */
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
-/* {{{ proto bool odbc_next_result(int result_id)
+/* {{{ proto bool odbc_next_result(resource result_id)
Checks if multiple results are avaiable */
PHP_FUNCTION(odbc_next_result)
{
@@ -2437,7 +2438,7 @@
/* }}} */
#endif
-/* {{{ proto int odbc_num_fields(int result_id)
+/* {{{ proto int odbc_num_fields(resource result_id)
Get number of columns in a result */
PHP_FUNCTION(odbc_num_fields)
{
@@ -2452,7 +2453,7 @@
}
/* }}} */
-/* {{{ proto string odbc_field_name(int result_id, int field_number)
+/* {{{ proto string odbc_field_name(resource result_id, int field_number)
Get a column name */
PHP_FUNCTION(odbc_field_name)
{
@@ -2486,7 +2487,7 @@
}
/* }}} */
-/* {{{ proto string odbc_field_type(int result_id, int field_number)
+/* {{{ proto string odbc_field_type(resource result_id, int field_number)
Get the datatype of a column */
PHP_FUNCTION(odbc_field_type)
{
@@ -2524,7 +2525,7 @@
}
/* }}} */
-/* {{{ proto int odbc_field_len(int result_id, int field_number)
+/* {{{ proto int odbc_field_len(resource result_id, int field_number)
Get the length (precision) of a column */
PHP_FUNCTION(odbc_field_len)
{
@@ -2532,7 +2533,7 @@
}
/* }}} */
-/* {{{ proto int odbc_field_scale(int result_id, int field_number)
+/* {{{ proto int odbc_field_scale(resource result_id, int field_number)
Get the scale of a column */
PHP_FUNCTION(odbc_field_scale)
{
@@ -2540,7 +2541,7 @@
}
/* }}} */
-/* {{{ proto int odbc_field_num(int result_id, string field_name)
+/* {{{ proto int odbc_field_num(resource result_id, string field_name)
Return column number */
PHP_FUNCTION(odbc_field_num)
{
@@ -2576,7 +2577,7 @@
}
/* }}} */
-/* {{{ proto int odbc_autocommit(int connection_id [, int OnOff])
+/* {{{ proto mixed odbc_autocommit(resource connection_id [, int OnOff])
Toggle autocommit mode or get status */
/* There can be problems with pconnections!*/
PHP_FUNCTION(odbc_autocommit)
@@ -2624,7 +2625,7 @@
}
/* }}} */
-/* {{{ proto int odbc_commit(int connection_id)
+/* {{{ proto bool odbc_commit(resource connection_id)
Commit an ODBC transaction */
PHP_FUNCTION(odbc_commit)
{
@@ -2632,7 +2633,7 @@
}
/* }}} */
-/* {{{ proto int odbc_rollback(int connection_id)
+/* {{{ proto bool odbc_rollback(resource connection_id)
Rollback a transaction */
PHP_FUNCTION(odbc_rollback)
{
@@ -2678,7 +2679,7 @@
}
/* }}} */
-/* {{{ proto string odbc_error([int connection_id])
+/* {{{ proto string odbc_error([resource connection_id])
Get the last error code */
PHP_FUNCTION(odbc_error)
{
@@ -2686,7 +2687,7 @@
}
/* }}} */
-/* {{{ proto string odbc_errormsg([int connection_id])
+/* {{{ proto string odbc_errormsg([resource connection_id])
Get the last error message */
PHP_FUNCTION(odbc_errormsg)
{
@@ -2694,7 +2695,7 @@
}
/* }}} */
-/* {{{ proto int odbc_setoption(int conn_id|result_id, int which, int option, int
value)
+/* {{{ proto bool odbc_setoption(resource conn_id|result_id, int which, int option,
int value)
Sets connection or statement options */
/* This one has to be used carefully. We can't allow to set connection options for
persistent connections. I think that SetStmtOption is of little use, since most
@@ -2754,7 +2755,7 @@
* metadata functions
*/
-/* {{{ proto int odbc_tables(int connection_id [, string qualifier, string owner,
string name, string table_types])
+/* {{{ proto resource odbc_tables(resource connection_id [, string qualifier, string
owner, string name, string table_types])
Call the SQLTables function */
PHP_FUNCTION(odbc_tables)
{
@@ -2833,7 +2834,7 @@
}
/* }}} */
-/* {{{ proto int odbc_columns(int connection_id, string qualifier, string owner,
string table_name, string column_name)
+/* {{{ proto resource odbc_columns(resource connection_id, string qualifier, string
owner, string table_name, string column_name)
Returns a result identifier that can be used to fetch a list of column names in
specified tables */
PHP_FUNCTION(odbc_columns)
{
@@ -2920,7 +2921,7 @@
/* }}} */
#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&
!defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP)
-/* {{{ proto int odbc_columnprivileges(int connection_id, string catalog, string
schema, string table, string column)
+/* {{{ proto resource odbc_columnprivileges(resource connection_id, string catalog,
string schema, string table, string column)
Returns a result identifier that can be used to fetch a list of columns and
associated privileges for the specified table */
PHP_FUNCTION(odbc_columnprivileges)
{
@@ -2996,7 +2997,7 @@
#endif /* HAVE_DBMAKER || HAVE_SOLID*/
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
-/* {{{ proto int odbc_foreignkeys(int connection_id, string pk_qualifier, string
pk_owner, string pk_table, string fk_qualifier, string fk_owner, string fk_table)
+/* {{{ proto resource odbc_foreignkeys(resource connection_id, string pk_qualifier,
string pk_owner, string pk_table, string fk_qualifier, string fk_owner, string
fk_table)
Returns a result identifier to either a list of foreign keys in the specified
table or a list of foreign keys in other tables that refer to the primary key in the
specified table */
PHP_FUNCTION(odbc_foreignkeys)
{
@@ -3091,7 +3092,7 @@
/* }}} */
#endif /* HAVE_SOLID */
-/* {{{ proto int odbc_gettypeinfo(int connection_id [, int data_type])
+/* {{{ proto resource odbc_gettypeinfo(resource connection_id [, int data_type])
Returns a result identifier containing information about data types supported by
the data source */
PHP_FUNCTION(odbc_gettypeinfo)
{
@@ -3159,7 +3160,7 @@
}
/* }}} */
-/* {{{ proto int odbc_primarykeys(int connection_id, string qualifier, string owner,
string table)
+/* {{{ proto resource odbc_primarykeys(resource connection_id, string qualifier,
string owner, string table)
Returns a result identifier listing the column names that comprise the primary key
for a table */
PHP_FUNCTION(odbc_primarykeys)
{
@@ -3231,7 +3232,7 @@
/* }}} */
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35) &&
!defined(HAVE_BIRDSTEP)
-/* {{{ proto int odbc_procedurecolumns(int connection_id [, string qualifier, string
owner, string proc, string column])
+/* {{{ proto resource odbc_procedurecolumns(resource connection_id [, string
qualifier, string owner, string proc, string column])
Returns a result identifier containing the list of input and output parameters, as
well as the columns that make up the result set for the specified procedures */
PHP_FUNCTION(odbc_procedurecolumns)
{
@@ -3311,7 +3312,7 @@
#endif /* HAVE_SOLID */
#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) && !defined(HAVE_SOLID_35)
-/* {{{ proto int odbc_procedures(int connection_id [, string qualifier, string owner,
string name])
+/* {{{ proto resource odbc_procedures(resource connection_id [, string qualifier,
string owner, string name])
Returns a result identifier containg the list of procedure names in a datasource */
PHP_FUNCTION(odbc_procedures)
{
@@ -3387,7 +3388,7 @@
/* }}} */
#endif /* HAVE_SOLID */
-/* {{{ proto int odbc_specialcolumns(int connection_id, int type, string qualifier,
string owner, string table, int scope, int nullable)
+/* {{{ proto resource odbc_specialcolumns(resource connection_id, int type, string
qualifier, string owner, string table, int scope, int nullable)
Returns a result identifier containing either the optimal set of columns that
uniquely identifies a row in the table or columns that are automatically updated when
any value in the row is updated by a transaction */
PHP_FUNCTION(odbc_specialcolumns)
{
@@ -3471,7 +3472,7 @@
}
/* }}} */
-/* {{{ proto int odbc_statistics(int connection_id, string qualifier, string owner,
string name, int unique, int accuracy)
+/* {{{ proto resource odbc_statistics(resource connection_id, string qualifier,
string owner, string name, int unique, int accuracy)
Returns a result identifier that contains statistics about a single table and the
indexes associated with the table */
PHP_FUNCTION(odbc_statistics)
{
@@ -3552,7 +3553,7 @@
/* }}} */
#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) &&
!defined(HAVE_SOLID_35) && !defined(HAVE_BIRDSTEP)
-/* {{{ proto int odbc_tableprivileges(int connection_id, string qualifier, string
owner, string name)
+/* {{{ proto resource odbc_tableprivileges(resource connection_id, string qualifier,
string owner, string name)
Returns a result identifier containing a list of tables and the privileges
associated with each table */
PHP_FUNCTION(odbc_tableprivileges)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
