diff options
| -rw-r--r-- | ext/dbx/dbx.c | 4 | ||||
| -rwxr-xr-x | ext/mailparse/mailparse.c | 6 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 34 | ||||
| -rwxr-xr-x | ext/pcntl/pcntl.c | 11 |
4 files changed, 28 insertions, 27 deletions
diff --git a/ext/dbx/dbx.c b/ext/dbx/dbx.c index a98d508b11..dec0e1032f 100644 --- a/ext/dbx/dbx.c +++ b/ext/dbx/dbx.c @@ -535,7 +535,7 @@ ZEND_FUNCTION(dbx_error) * dbx functions that are database independent... like sorting result_objects! */ -/* {{{ proto long dbx_compare(array row_x, array row_y, string columnname [, flags]) +/* {{{ proto int dbx_compare(array row_x, array row_y, string columnname [, flags]) returns row_y[columnname] - row_x[columnname], converted to -1, 0 or 1 */ ZEND_FUNCTION(dbx_compare) @@ -627,7 +627,7 @@ ZEND_FUNCTION(dbx_compare) } /* }}} */ -/* {{{ proto long dbx_sort(dbx_result_object dbx_result, string compare_function_name) +/* {{{ proto int dbx_sort(dbx_result_object dbx_result, string compare_function_name) returns 0 on failure, 1 on success */ ZEND_FUNCTION(dbx_sort) diff --git a/ext/mailparse/mailparse.c b/ext/mailparse/mailparse.c index b96ee23329..75c5559044 100755 --- a/ext/mailparse/mailparse.c +++ b/ext/mailparse/mailparse.c @@ -308,7 +308,7 @@ PHP_FUNCTION(mailparse_rfc822_parse_addresses) } /* }}} */ -/* {{{ proto long mailparse_determine_best_xfer_encoding(resource fp) +/* {{{ proto int mailparse_determine_best_xfer_encoding(resource fp) figure out the best way of encoding the content read from the file pointer fp, which must be seek-able. */ PHP_FUNCTION(mailparse_determine_best_xfer_encoding) @@ -556,7 +556,7 @@ PHP_FUNCTION(mailparse_msg_free) /* }}} */ -/* {{{ proto long mailparse_msg_create() +/* {{{ proto int mailparse_msg_create() Return a handle that can be used to parse a message */ PHP_FUNCTION(mailparse_msg_create) @@ -885,7 +885,7 @@ PHP_FUNCTION(mailparse_msg_get_part_data) } /* }}} */ -/* {{{ proto long mailparse_msg_get_part(resource rfc2045, string mimesection) +/* {{{ proto int mailparse_msg_get_part(resource rfc2045, string mimesection) Return a handle on a given section in a mimemessage */ PHP_FUNCTION(mailparse_msg_get_part) diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 9d4bc2ab80..a22c0fc91f 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -691,7 +691,7 @@ static int php_mysql_get_default_link(INTERNAL_FUNCTION_PARAMETERS) } /* }}} */ -/* {{{ proto int mysql_connect([string hostname[:port][:/path/to/socket]] [, string username] [, string password]) +/* {{{ proto resource mysql_connect([string hostname[:port][:/path/to/socket]] [, string username] [, string password]) Open a connection to a MySQL Server */ PHP_FUNCTION(mysql_connect) { @@ -699,7 +699,7 @@ PHP_FUNCTION(mysql_connect) } /* }}} */ -/* {{{ proto int mysql_pconnect([string hostname[:port][:/path/to/socket]] [, string username] [, string password]) +/* {{{ proto resource mysql_pconnect([string hostname[:port][:/path/to/socket]] [, string username] [, string password]) Open a persistent connection to a MySQL Server */ PHP_FUNCTION(mysql_pconnect) { @@ -707,7 +707,7 @@ PHP_FUNCTION(mysql_pconnect) } /* }}} */ -/* {{{ proto int mysql_close([int link_identifier]) +/* {{{ proto bool mysql_close([int link_identifier]) Close a MySQL connection */ PHP_FUNCTION(mysql_close) { @@ -746,7 +746,7 @@ PHP_FUNCTION(mysql_close) } /* }}} */ -/* {{{ proto int mysql_select_db(string database_name [, int link_identifier]) +/* {{{ proto bool mysql_select_db(string database_name [, int link_identifier]) Select a MySQL database */ PHP_FUNCTION(mysql_select_db) { @@ -893,7 +893,7 @@ PHP_FUNCTION(mysql_get_server_info) #endif #if MYSQL_VERSION_ID < 40000 -/* {{{ proto int mysql_create_db(string database_name [, int link_identifier]) +/* {{{ proto bool mysql_create_db(string database_name [, int link_identifier]) Create a MySQL database */ PHP_FUNCTION(mysql_create_db) { @@ -931,7 +931,7 @@ PHP_FUNCTION(mysql_create_db) } /* }}} */ -/* {{{ proto int mysql_drop_db(string database_name [, int link_identifier]) +/* {{{ proto bool mysql_drop_db(string database_name [, int link_identifier]) Drop (delete) a MySQL database */ PHP_FUNCTION(mysql_drop_db) { @@ -1062,7 +1062,7 @@ static void php_mysql_do_query(INTERNAL_FUNCTION_PARAMETERS, int use_store) } /* }}} */ -/* {{{ proto int mysql_query(string query [, int link_identifier] [, int result_mode]) +/* {{{ proto resource mysql_query(string query [, int link_identifier] [, int result_mode]) Send an SQL query to MySQL */ PHP_FUNCTION(mysql_query) { @@ -1071,7 +1071,7 @@ PHP_FUNCTION(mysql_query) /* }}} */ -/* {{{ proto int mysql_unbuffered_query(string query [, int link_identifier] [, int result_mode]) +/* {{{ proto resource mysql_unbuffered_query(string query [, int link_identifier] [, int result_mode]) Send an SQL query to MySQL, without fetching and buffering the result rows */ PHP_FUNCTION(mysql_unbuffered_query) { @@ -1080,7 +1080,7 @@ PHP_FUNCTION(mysql_unbuffered_query) /* }}} */ -/* {{{ proto int mysql_db_query(string database_name, string query [, int link_identifier]) +/* {{{ proto resource mysql_db_query(string database_name, string query [, int link_identifier]) Send an SQL query to MySQL */ PHP_FUNCTION(mysql_db_query) { @@ -1113,7 +1113,7 @@ PHP_FUNCTION(mysql_db_query) /* }}} */ -/* {{{ proto int mysql_list_dbs([int link_identifier]) +/* {{{ proto resource mysql_list_dbs([int link_identifier]) List databases available on a MySQL server */ PHP_FUNCTION(mysql_list_dbs) { @@ -1149,7 +1149,7 @@ PHP_FUNCTION(mysql_list_dbs) /* }}} */ -/* {{{ proto int mysql_list_tables(string database_name [, int link_identifier]) +/* {{{ proto resource mysql_list_tables(string database_name [, int link_identifier]) List tables in a MySQL database */ PHP_FUNCTION(mysql_list_tables) { @@ -1192,7 +1192,7 @@ PHP_FUNCTION(mysql_list_tables) /* }}} */ -/* {{{ proto int mysql_list_fields(string database_name, string table_name [, int link_identifier]) +/* {{{ proto resource mysql_list_fields(string database_name, string table_name [, int link_identifier]) List MySQL result fields */ PHP_FUNCTION(mysql_list_fields) { @@ -1399,7 +1399,7 @@ PHP_FUNCTION(mysql_insert_id) /* }}} */ -/* {{{ proto int mysql_result(int result, int row [, mixed field]) +/* {{{ proto mixed mysql_result(int result, int row [, mixed field]) Get result data */ PHP_FUNCTION(mysql_result) { @@ -1516,7 +1516,7 @@ PHP_FUNCTION(mysql_num_rows) ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, "MySQL result", le_result); /* conversion from int64 to long happing here */ - Z_LVAL_P(return_value) = (long)mysql_num_rows(mysql_result); + Z_LVAL_P(return_value) = (long) mysql_num_rows(mysql_result); Z_TYPE_P(return_value) = IS_LONG; } /* }}} */ @@ -1663,7 +1663,7 @@ PHP_FUNCTION(mysql_fetch_assoc) } /* }}} */ -/* {{{ proto int mysql_data_seek(int result, int row_number) +/* {{{ proto bool mysql_data_seek(int result, int row_number) Move internal result pointer */ PHP_FUNCTION(mysql_data_seek) { @@ -1831,7 +1831,7 @@ PHP_FUNCTION(mysql_fetch_field) /* }}} */ -/* {{{ proto int mysql_field_seek(int result, int field_offset) +/* {{{ proto bool mysql_field_seek(int result, int field_offset) Set result pointer to a specific field offset */ PHP_FUNCTION(mysql_field_seek) { @@ -2033,7 +2033,7 @@ PHP_FUNCTION(mysql_field_flags) /* }}} */ -/* {{{ proto int mysql_free_result(int result) +/* {{{ proto bool mysql_free_result(int result) Free result memory */ PHP_FUNCTION(mysql_free_result) { diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index fdc9740721..d5d3e43466 100755 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -155,6 +155,7 @@ void php_register_signal_constants(INIT_FUNC_ARGS) REGISTER_LONG_CONSTANT("SIGPWR", (long) SIGPWR, CONST_CS | CONST_PERSISTENT); #endif REGISTER_LONG_CONSTANT("SIGSYS", (long) SIGSYS, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SIGBABY", (long) SIGSYS, CONST_CS | CONST_PERSISTENT); } static void php_pcntl_init_globals(zend_pcntl_globals *pcntl_globals) @@ -202,7 +203,7 @@ PHP_MINFO_FUNCTION(pcntl) php_info_print_table_end(); } -/* {{{ proto long pcntl_fork() +/* {{{ proto int pcntl_fork() Forks the currently running process following the same behavior as the UNIX fork() system call*/ PHP_FUNCTION(pcntl_fork) { @@ -217,7 +218,7 @@ PHP_FUNCTION(pcntl_fork) } /* }}} */ -/* {{{ proto long pcntl_waitpid(long pid, long status, long options) +/* {{{ proto int pcntl_waitpid(long pid, long status, long options) Waits on or returns the status of a forked child as defined by the waitpid() system call */ PHP_FUNCTION(pcntl_waitpid) { @@ -302,7 +303,7 @@ PHP_FUNCTION(pcntl_wifsignaled) } /* }}} */ -/* {{{ proto long pcntl_wexitstatus(long status) +/* {{{ proto int pcntl_wexitstatus(long status) Returns the status code of a child's exit */ PHP_FUNCTION(pcntl_wexitstatus) { @@ -325,7 +326,7 @@ PHP_FUNCTION(pcntl_wexitstatus) } /* }}} */ -/* {{{ proto long pcntl_wtermsig(long status) +/* {{{ proto int pcntl_wtermsig(long status) Returns the number of the signal that terminated the process who's status code is passed */ PHP_FUNCTION(pcntl_wtermsig) { @@ -346,7 +347,7 @@ PHP_FUNCTION(pcntl_wtermsig) } /* }}} */ -/* {{{ proto long pcntl_wstopsig(long status) +/* {{{ proto int pcntl_wstopsig(long status) Returns the number of the signal that caused the process to stop who's status code is passed */ PHP_FUNCTION(pcntl_wstopsig) { |