andrey Sun Jun 22 10:33:04 2003 EDT
Modified files:
/php4/ext/oci8 oci8.c
/php4/ext/oracle oracle.c
/php4/ext/ovrimos ovrimos.c
/php4/ext/pcntl pcntl.c
/php4/ext/pdf pdf.c
Log:
proto fixes.
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.210 php4/ext/oci8/oci8.c:1.211
--- php4/ext/oci8/oci8.c:1.210 Tue Jun 10 16:03:33 2003
+++ php4/ext/oci8/oci8.c Sun Jun 22 10:33:03 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.210 2003/06/10 20:03:33 imajes Exp $ */
+/* $Id: oci8.c,v 1.211 2003/06/22 14:33:03 andrey Exp $ */
/* TODO list:
*
@@ -641,7 +641,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.210 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.211 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -2788,7 +2788,7 @@
/************************* EXTENSION FUNCTIONS *************************/
-/* {{{ proto bool ocidefinebyname(int stmt, string name, mixed &var [, int type])
+/* {{{ proto bool ocidefinebyname(resource stmt, string name, mixed &var [, int type])
Define a PHP variable to an Oracle column by name */
/* if you want to define a LOB/CLOB etc make sure you allocate it via
OCINewDescriptor BEFORE defining!!!
*/
@@ -2847,7 +2847,7 @@
/* }}} */
-/* {{{ proto bool ocibindbyname(int stmt, string name, mixed &var, [, int maxlength]
[, int type])
+/* {{{ proto bool ocibindbyname(resource stmt, string name, mixed &var, [, int
maxlength [, int type]])
Bind a PHP variable to an Oracle placeholder by name */
/* if you want to bind a LOB/CLOB etc make sure you allocate it via OCINewDescriptor
BEFORE binding!!!
*/
@@ -3025,7 +3025,7 @@
/* }}} */
-/* {{{ proto bool ocifreedesc(object lob)
+/* {{{ proto bool ocifreedesc()
Deletes large object description */
PHP_FUNCTION(ocifreedesc)
@@ -3049,7 +3049,7 @@
}
/* }}} */
-/* {{{ proto bool ocisavelob(object lob)
+/* {{{ proto bool ocisavelob()
Saves a large object */
PHP_FUNCTION(ocisavelob)
@@ -3140,7 +3140,7 @@
/* }}} */
-/* {{{ proto bool ocisavelobfile(object lob)
+/* {{{ proto bool ocisavelobfile()
Saves a large object file */
PHP_FUNCTION(ocisavelobfile)
@@ -3221,7 +3221,7 @@
/* }}} */
-/* {{{ proto string ociloadlob(object lob)
+/* {{{ proto string ociloadlob()
Loads a large object */
PHP_FUNCTION(ociloadlob)
@@ -3246,7 +3246,7 @@
}
/* }}} */
-/* {{{ proto bool ociwritelobtofile(object lob [, string filename] [, int start] [,
int length])
+/* {{{ proto bool ociwritelobtofile([string filename [, int start [, int length]]])
Writes a large object into a file */
PHP_FUNCTION(ociwritelobtofile)
@@ -3432,8 +3432,8 @@
/* }}} */
#ifdef HAVE_OCI8_TEMP_LOB
-/* {{{ proto bool ociwritetemporarylob(int stmt, int loc, string var)
- Return the row count of an OCI statement */
+/* {{{ proto bool ociwritetemporarylob(string var)
+ Writes temporary blob */
PHP_FUNCTION(ociwritetemporarylob)
{
@@ -3465,7 +3465,7 @@
if (zend_get_parameters_ex(1, &var) == FAILURE) {
WRONG_PARAM_COUNT;
}
-
+ /* is this convert needed - done again below */
convert_to_string_ex(var);
CALL_OCI_RETURN(connection->error, OCILobCreateTemporary(
@@ -3529,7 +3529,7 @@
/* }}} */
-/* {{{ proto bool ocicloselob(object lob)
+/* {{{ proto bool ocicloselob()
Closes lob descriptor */
PHP_FUNCTION(ocicloselob)
@@ -3597,7 +3597,7 @@
/* }}} */
#endif
-/* {{{ proto string ocinewdescriptor(int connection [, int type])
+/* {{{ proto object ocinewdescriptor(resource connection [, int type])
Initialize a new empty descriptor LOB/FILE (LOB is default) */
PHP_FUNCTION(ocinewdescriptor)
@@ -3630,7 +3630,7 @@
/* }}} */
-/* {{{ proto bool ocirollback(int conn)
+/* {{{ proto bool ocirollback(resource conn)
Rollback the current context */
PHP_FUNCTION(ocirollback)
@@ -3666,7 +3666,7 @@
/* }}} */
-/* {{{ proto bool ocicommit(int conn)
+/* {{{ proto bool ocicommit(resource conn)
Commit the current context */
PHP_FUNCTION(ocicommit)
@@ -3702,7 +3702,7 @@
/* }}} */
-/* {{{ proto string ocicolumnname(int stmt, int col)
+/* {{{ proto string ocicolumnname(resource stmt, int col)
Tell the name of a column */
PHP_FUNCTION(ocicolumnname)
@@ -3727,7 +3727,7 @@
/* }}} */
-/* {{{ proto int ocicolumnsize(int stmt, int col)
+/* {{{ proto int ocicolumnsize(resource stmt, int col)
Tell the maximum data size of a column */
PHP_FUNCTION(ocicolumnsize)
@@ -3760,7 +3760,7 @@
/* }}} */
-/* {{{ proto int ocicolumnscale(int stmt, int col)
+/* {{{ proto int ocicolumnscale(resource stmt, int col)
Tell the scale of a column */
PHP_FUNCTION(ocicolumnscale)
@@ -3784,7 +3784,7 @@
/* }}} */
-/* {{{ proto int ocicolumnprecision(int stmt, int col)
+/* {{{ proto int ocicolumnprecision(resource stmt, int col)
Tell the precision of a column */
PHP_FUNCTION(ocicolumnprecision)
@@ -3808,7 +3808,7 @@
/* }}} */
-/* {{{ proto mixed ocicolumntype(int stmt, int col)
+/* {{{ proto mixed ocicolumntype(resource stmt, int col)
Tell the data type of a column */
PHP_FUNCTION(ocicolumntype)
@@ -3881,7 +3881,7 @@
/* }}} */
-/* {{{ proto mixed ocicolumntyperaw(int stmt, int col)
+/* {{{ proto mixed ocicolumntyperaw(resource stmt, int col)
Tell the raw oracle data type of a column */
PHP_FUNCTION(ocicolumntyperaw)
@@ -3905,7 +3905,7 @@
/* }}} */
-/* {{{ proto bool ocicolumnisnull(int stmt, int col)
+/* {{{ proto bool ocicolumnisnull(resource stmt, int col)
Tell whether a column is NULL */
PHP_FUNCTION(ocicolumnisnull)
@@ -3952,7 +3952,7 @@
/* }}} */
-/* {{{ proto bool ociexecute(int stmt [, int mode])
+/* {{{ proto bool ociexecute(resource stmt [, int mode])
Execute a parsed statement */
PHP_FUNCTION(ociexecute)
@@ -3981,7 +3981,7 @@
/* }}} */
-/* {{{ proto bool ocicancel(int stmt)
+/* {{{ proto bool ocicancel(resource stmt)
Prepare a new row of data for reading */
PHP_FUNCTION(ocicancel)
@@ -4004,7 +4004,7 @@
/* }}} */
-/* {{{ proto bool ocifetch(int stmt)
+/* {{{ proto bool ocifetch(resource stmt)
Prepare a new row of data for reading */
PHP_FUNCTION(ocifetch)
@@ -4028,7 +4028,7 @@
/* }}} */
-/* {{{ proto int ocifetchinto(int stmt, array &output [, int mode])
+/* {{{ proto int ocifetchinto(resource stmt, array &output [, int mode])
Fetch a row of result data into an array */
PHP_FUNCTION(ocifetchinto)
@@ -4093,7 +4093,7 @@
/* }}} */
-/* {{{ proto int ocifetchstatement(int stmt, array &output[, int skip][, int
maxrows][, int flags])
+/* {{{ proto int ocifetchstatement(resource stmt, array &output[, int skip][, int
maxrows][, int flags])
Fetch all rows of result data into an array */
PHP_FUNCTION(ocifetchstatement)
@@ -4226,7 +4226,7 @@
/* }}} */
-/* {{{ proto bool ocifreestatement(int stmt)
+/* {{{ proto bool ocifreestatement(resource stmt)
Free all resources associated with a statement */
PHP_FUNCTION(ocifreestatement)
@@ -4247,7 +4247,7 @@
/* }}} */
-/* {{{ proto bool ocilogoff(int conn)
+/* {{{ proto bool ocilogoff(resource conn)
Disconnect from database */
PHP_FUNCTION(ocilogoff)
@@ -4283,10 +4283,10 @@
/* }}} */
-/* {{{ proto int ocinlogon(string user, string pass [, string db])
+/* {{{ proto resource ocinlogon(string user, string pass [, string db])
Connect to an Oracle database and log on. returns a new session */
-/* Connects to an Oracle 8 database and logs on. If the
+/* Connects to an Oracle 8/9 database and logs on. If the
* optional third parameter is not specified, PHP uses the environment
* variable ORACLE_SID to determine which database to connect to.
*/
@@ -4297,11 +4297,11 @@
/* }}} */
-/* {{{ proto int ocilogon(string user, string pass [, string db])
+/* {{{ proto resource ocilogon(string user, string pass [, string db])
Connect to an Oracle database and log on. Returns a new session.
*/
-/* Connects to an Oracle 8 database and logs on. If the
+/* Connects to an Oracle 8/9 database and logs on. If the
* optional third parameter is not specified, PHP uses the environment
* variable ORACLE_SID to determine which database to connect to.
*/
@@ -4312,10 +4312,10 @@
/* }}} */
-/* {{{ proto int ociplogon(string user, string pass [, string db])
+/* {{{ proto resource ociplogon(string user, string pass [, string db])
Connect to an Oracle database using a persistent connection and log on. Returns a
new session. */
-/* Connects to an Oracle 8 database and logs on. If the
+/* Connects to an Oracle 8/9 database and logs on. If the
* optional third parameter is not specified, PHP uses the environment
* variable ORACLE_SID to determine which database to connect to.
*/
@@ -4326,7 +4326,7 @@
/* }}} */
-/* {{{ proto array ocierror([int stmt|conn|global])
+/* {{{ proto array ocierror([resource stmt|conn|global])
Return the last error of stmt|conn|global. If no error happened returns false. */
PHP_FUNCTION(ocierror)
@@ -4412,7 +4412,7 @@
/* }}} */
-/* {{{ proto int ocinumcols(int stmt)
+/* {{{ proto int ocinumcols(resource stmt)
Return the number of result columns in a statement */
PHP_FUNCTION(ocinumcols)
@@ -4431,7 +4431,7 @@
/* }}} */
-/* {{{ proto int ociparse(int conn, string query)
+/* {{{ proto resource ociparse(resource conn, string query)
Parse a query and return a statement */
PHP_FUNCTION(ociparse)
@@ -4459,7 +4459,7 @@
/* }}} */
-/* {{{ proto int ocisetprefetch(int stmt, int prefetch_rows)
+/* {{{ proto bool ocisetprefetch(resource stmt, int prefetch_rows)
sets the number of rows to be prefetched on execute to prefetch_rows for stmt */
PHP_FUNCTION(ocisetprefetch)
@@ -4482,8 +4482,8 @@
/* }}} */
-/* {{{ proto bool ocipasswordchange(int conn, string username, string old_password,
string new_password)
- changes the password of an account*/
+/* {{{ proto bool ocipasswordchange(resource conn, string username, string
old_password, string new_password)
+ Changes the password of an account*/
PHP_FUNCTION(ocipasswordchange)
{
@@ -4534,7 +4534,7 @@
/* }}} */
-/* {{{ proto int ocinewcursor(int conn)
+/* {{{ proto int ocinewcursor(resource conn)
Return a new cursor (Statement-Handle) - use this to bind ref-cursors! */
PHP_FUNCTION(ocinewcursor)
@@ -4556,7 +4556,7 @@
/* }}} */
-/* {{{ proto string ociresult(int stmt, mixed column)
+/* {{{ proto string ociresult(resource stmt, mixed column)
Return a single column of result data */
PHP_FUNCTION(ociresult)
@@ -4582,7 +4582,7 @@
/* }}} */
-/* {{{ proto string ociserverversion(int conn)
+/* {{{ proto string ociserverversion(resource conn)
Return a string containing server version information */
PHP_FUNCTION(ociserverversion)
@@ -4615,7 +4615,7 @@
/* }}} */
-/* {{{ proto string ocistatementtype(int stmt)
+/* {{{ proto string ocistatementtype(resource stmt)
Return the query type of an OCI statement */
/* XXX it would be better with a general interface to OCIAttrGet() */
@@ -4680,7 +4680,7 @@
}
/* }}} */
-/* {{{ proto int ocirowcount(int stmt)
+/* {{{ proto int ocirowcount(resource stmt)
Return the row count of an OCI statement */
PHP_FUNCTION(ocirowcount)
@@ -4732,7 +4732,7 @@
}
/* }}} */
-/* {{{ proto bool ocifreecollection(object lob)
+/* {{{ proto bool ocifreecollection()
Deletes collection object*/
PHP_FUNCTION(ocifreecollection)
@@ -4772,7 +4772,7 @@
}
/* }}} */
-/* {{{ proto bool ocicollappend(object collection,value)
+/* {{{ proto bool ocicollappend(string value)
Append an object to the collection */
PHP_FUNCTION(ocicollappend)
@@ -4918,7 +4918,7 @@
}
/* }}} */
-/* {{{ proto string ocicollgetelem(object collection,ndx)
+/* {{{ proto string ocicollgetelem(int ndx)
Retrieve the value at collection index ndx */
PHP_FUNCTION(ocicollgetelem)
@@ -5024,7 +5024,7 @@
}
/* }}} */
-/* {{{ proto bool ocicollassign(object collection,object)
+/* {{{ proto bool ocicollassign(object from)
Assign a collection from another existing collection */
PHP_FUNCTION(ocicollassign)
@@ -5066,7 +5066,7 @@
}
/* }}} */
-/* {{{ proto bool ocicollassignelem(object collection,ndx,val)
+/* {{{ proto bool ocicollassignelem(int index, string val)
Assign element val to collection at index ndx */
PHP_FUNCTION(ocicollassignelem)
@@ -5103,7 +5103,7 @@
}
/*
- * Handle NULLS. For consistency with the rest of the OCI8 library,
when
+ * Handle NULLs. For consistency with the rest of the OCI8 library,
when
* a value passed in is a 0 length string, consider it a null
*/
convert_to_string_ex(val);
@@ -5229,7 +5229,7 @@
}
/* }}} */
-/* {{{ proto int ocicollsize(object collection)
+/* {{{ proto int ocicollsize()
Return the size of a collection */
PHP_FUNCTION(ocicollsize)
@@ -5263,7 +5263,7 @@
}
/* }}} */
-/* {{{ proto int ocicollmax(object collection)
+/* {{{ proto int ocicollmax()
Return the max value of a collection. For a varray this is the maximum length of
the array */
PHP_FUNCTION(ocicollmax)
@@ -5285,7 +5285,7 @@
}
/* }}} */
-/* {{{ proto bool ocicolltrim(object collection,num)
+/* {{{ proto bool ocicolltrim(int num)
Trim num elements from the end of a collection */
PHP_FUNCTION(ocicolltrim)
@@ -5319,7 +5319,7 @@
}
/* }}} */
-/* {{{ proto bool ocinewcollection(int connection, string tdo,[string schema])
+/* {{{ proto object ocinewcollection(resource connection, string tdo [, string
schema])
Initialize a new collection */
PHP_FUNCTION(ocinewcollection)
Index: php4/ext/oracle/oracle.c
diff -u php4/ext/oracle/oracle.c:1.89 php4/ext/oracle/oracle.c:1.90
--- php4/ext/oracle/oracle.c:1.89 Tue Jun 10 16:03:34 2003
+++ php4/ext/oracle/oracle.c Sun Jun 22 10:33:03 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oracle.c,v 1.89 2003/06/10 20:03:34 imajes Exp $ */
+/* $Id: oracle.c,v 1.90 2003/06/22 14:33:03 andrey Exp $ */
/* comment out the next line if you're on Oracle 7.x and don't have the olog
call. */
@@ -397,7 +397,7 @@
** PHP functions
*/
-/* {{{ proto int ora_logon(string user, string password)
+/* {{{ proto resource ora_logon(string user, string password)
Open an Oracle connection */
PHP_FUNCTION(ora_logon)
{
@@ -405,7 +405,7 @@
}
/* }}} */
-/* {{{ proto int ora_plogon(string user, string password)
+/* {{{ proto resource ora_plogon(string user, string password)
Open a persistent Oracle connection */
PHP_FUNCTION(ora_plogon)
{
@@ -588,7 +588,7 @@
}
/* }}} */
-/* {{{ proto int ora_logoff(int connection)
+/* {{{ proto bool ora_logoff(resource connection)
Close an Oracle connection */
PHP_FUNCTION(ora_logoff)
{ /* conn_index */
@@ -606,7 +606,7 @@
}
/* }}} */
-/* {{{ proto int ora_open(int connection)
+/* {{{ proto resource ora_open(resource connection)
Open an Oracle cursor */
PHP_FUNCTION(ora_open)
{ /* conn_index */
@@ -635,7 +635,7 @@
/* }}} */
-/* {{{ proto int ora_close(int cursor)
+/* {{{ proto bool ora_close(resource cursor)
Close an Oracle cursor */
PHP_FUNCTION(ora_close)
{ /* conn_index */
@@ -653,7 +653,7 @@
}
/* }}} */
-/* {{{ proto int ora_commitoff(int connection)
+/* {{{ proto bool ora_commitoff(resource connection)
Disable automatic commit */
PHP_FUNCTION(ora_commitoff)
{ /* conn_index */
@@ -674,7 +674,7 @@
}
/* }}} */
-/* {{{ proto int ora_commiton(int connection)
+/* {{{ proto bool ora_commiton(resource connection)
Enable automatic commit */
PHP_FUNCTION(ora_commiton)
{ /* conn_index */
@@ -695,7 +695,7 @@
}
/* }}} */
-/* {{{ proto int ora_commit(int connection)
+/* {{{ proto bool ora_commit(resource connection)
Commit an Oracle transaction */
PHP_FUNCTION(ora_commit)
{ /* conn_index */
@@ -716,7 +716,7 @@
}
/* }}} */
-/* {{{ proto int ora_rollback(int connection)
+/* {{{ proto bool ora_rollback(resource connection)
Roll back an Oracle transaction */
PHP_FUNCTION(ora_rollback)
{ /* conn_index */
@@ -737,7 +737,7 @@
}
/* }}} */
-/* {{{ proto int ora_parse(int cursor, string sql_statement [, int defer])
+/* {{{ proto bool ora_parse(resource cursor, string sql_statement [, int defer])
Parse an Oracle SQL statement */
PHP_FUNCTION(ora_parse)
{
@@ -796,7 +796,7 @@
}
/* }}} */
-/* {{{ proto int ora_bind(int cursor, string php_variable_name, string
sql_parameter_name, int length [, int type])
+/* {{{ proto bool ora_bind(resource cursor, string php_variable_name, string
sql_parameter_name, int length [, int type])
Bind a PHP variable to an Oracle parameter */
PHP_FUNCTION(ora_bind)
{
@@ -893,7 +893,7 @@
/*
XXX Make return values compatible with old module ?
*/
-/* {{{ proto int ora_exec(int cursor)
+/* {{{ proto bool ora_exec(resource cursor)
Execute a parsed statement */
PHP_FUNCTION(ora_exec)
{ /* cursor_index */
@@ -935,7 +935,7 @@
}
/* }}} */
-/* {{{ proto int ora_numcols(int cursor)
+/* {{{ proto int ora_numcols(resource cursor)
Returns the numbers of columns in a result */
PHP_FUNCTION(ora_numcols)
{ /* cursor_index */
@@ -953,7 +953,7 @@
}
/* }}} */
-/* {{{ proto int ora_numrows(int cursor)
+/* {{{ proto int ora_numrows(resource cursor)
Returns the number of rows in a result */
PHP_FUNCTION(ora_numrows)
{ /* cursor_index */
@@ -972,7 +972,7 @@
/* }}} */
/* prepares/executes/fetches 1st row if avail*/
-/* {{{ proto int ora_do(int connection, int cursor)
+/* {{{ proto resource ora_do(resource connection, resource cursor)
Parse and execute a statement and fetch first result row */
PHP_FUNCTION(ora_do)
{
@@ -1047,7 +1047,7 @@
}
/* }}} */
-/* {{{ proto int ora_fetch(int cursor)
+/* {{{ proto bool ora_fetch(resource cursor)
Fetch a row of result data from a cursor */
PHP_FUNCTION(ora_fetch)
{ /* cursor_index */
@@ -1080,7 +1080,7 @@
}
/* }}} */
-/* {{{ proto int ora_fetch_into(int cursor, array result [, int flags])
+/* {{{ proto int ora_fetch_into(resource cursor, array result [, int flags])
Fetch a row into the specified result array */
PHP_FUNCTION(ora_fetch_into)
{
@@ -1214,7 +1214,7 @@
}
/* }}} */
-/* {{{ proto string ora_columnname(int cursor, int column)
+/* {{{ proto string ora_columnname(resource cursor, int column)
Get the name of an Oracle result column */
PHP_FUNCTION(ora_columnname)
{ /* cursor_index,
column_index */
@@ -1251,7 +1251,7 @@
}
/* }}} */
-/* {{{ proto string ora_columntype(int cursor, int column)
+/* {{{ proto string ora_columntype(resource cursor, int column)
Get the type of an Oracle result column */
PHP_FUNCTION(ora_columntype)
{ /* cursor_index,
column_index */
@@ -1356,7 +1356,7 @@
}
/* }}} */
-/* {{{ proto mixed ora_getcolumn(int cursor, int column)
+/* {{{ proto mixed ora_getcolumn(resource cursor, int column)
Get data from a fetched row */
PHP_FUNCTION(ora_getcolumn)
{ /* cursor_index,
column_index */
@@ -1483,7 +1483,7 @@
}
/* }}} */
-/* {{{ proto string ora_error(int cursor_or_connection)
+/* {{{ proto string ora_error(resource cursor_or_connection)
Get an Oracle error message */
PHP_FUNCTION(ora_error)
{
@@ -1515,7 +1515,7 @@
}
/* }}} */
-/* {{{ proto int ora_errorcode(int cursor_or_connection)
+/* {{{ proto int ora_errorcode(resource cursor_or_connection)
Get an Oracle error code */
PHP_FUNCTION(ora_errorcode)
{
Index: php4/ext/ovrimos/ovrimos.c
diff -u php4/ext/ovrimos/ovrimos.c:1.23 php4/ext/ovrimos/ovrimos.c:1.24
--- php4/ext/ovrimos/ovrimos.c:1.23 Tue Jun 10 16:03:34 2003
+++ php4/ext/ovrimos/ovrimos.c Sun Jun 22 10:33:03 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ovrimos.c,v 1.23 2003/06/10 20:03:34 imajes Exp $ */
+/* $Id: ovrimos.c,v 1.24 2003/06/22 14:33:03 andrey Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -152,7 +152,7 @@
/* }}} */
-/* {{{ proto int ovrimos_longreadlen(int result_id, int length)
+/* {{{ proto bool ovrimos_longreadlen(int result_id, int length)
Handle LONG columns */
PHP_FUNCTION(ovrimos_longreadlen)
{
@@ -278,7 +278,7 @@
/*
* Execute prepared SQL statement. Supports only input parameters.
*/
-/* {{{ proto int ovrimos_execute(int result_id [, array parameters_array])
+/* {{{ proto bool ovrimos_execute(int result_id [, array parameters_array])
Execute a prepared statement */
PHP_FUNCTION(ovrimos_execute)
{
@@ -601,7 +601,7 @@
}
/* }}} */
-/* {{{ proto int ovrimos_fetch_into(int result_id, array result_array [, string how,
[int rownumber]])
+/* {{{ proto bool ovrimos_fetch_into(int result_id, array result_array [, string how
[, int rownumber]])
Fetch one result row into an array
how: 'Next' (default), 'Prev', 'First', 'Last', 'Absolute'
*/
@@ -727,7 +727,7 @@
/* }}} */
-/* {{{ proto int ovrimos_fetch_row(int result_id [, int how, [int row_number]])
+/* {{{ proto bool ovrimos_fetch_row(int result_id [, int how [, int row_number]])
how: 'Next' (default), 'Prev', 'First', 'Last', 'Absolute'
Fetch a row */
PHP_FUNCTION(ovrimos_fetch_row)
@@ -936,7 +936,7 @@
/* }}} */
-/* {{{ proto int ovrimos_free_result(int result_id)
+/* {{{ proto bool ovrimos_free_result(int result_id)
Free resources associated with a result */
PHP_FUNCTION(ovrimos_free_result)
{
@@ -1041,7 +1041,7 @@
/* }}} */
-/* {{{ proto string ovrimos_field_type(int result_id, int field_number)
+/* {{{ proto int ovrimos_field_type(int result_id, int field_number)
Get the datatype of a column */
PHP_FUNCTION(ovrimos_field_type)
{
@@ -1162,7 +1162,7 @@
/* }}} */
#endif
-/* {{{ proto int ovrimos_commit(int connection_id)
+/* {{{ proto bool ovrimos_commit(int connection_id)
Commit an ovrimos transaction */
PHP_FUNCTION(ovrimos_commit)
{
@@ -1193,7 +1193,7 @@
/* }}} */
-/* {{{ proto int ovrimos_rollback(int connection_id)
+/* {{{ proto bool ovrimos_rollback(int connection_id)
Rollback a transaction */
PHP_FUNCTION(ovrimos_rollback)
{
Index: php4/ext/pcntl/pcntl.c
diff -u php4/ext/pcntl/pcntl.c:1.35 php4/ext/pcntl/pcntl.c:1.36
--- php4/ext/pcntl/pcntl.c:1.35 Tue Jun 10 16:03:34 2003
+++ php4/ext/pcntl/pcntl.c Sun Jun 22 10:33:04 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcntl.c,v 1.35 2003/06/10 20:03:34 imajes Exp $ */
+/* $Id: pcntl.c,v 1.36 2003/06/22 14:33:04 andrey Exp $ */
#define PCNTL_DEBUG 0
@@ -222,7 +222,7 @@
}
/* }}} */
-/* {{{ proto int pcntl_waitpid(long pid, long status, long options)
+/* {{{ proto int pcntl_waitpid(int pid, int &status, int options)
Waits on or returns the status of a forked child as defined by the waitpid()
system call */
PHP_FUNCTION(pcntl_waitpid)
{
@@ -246,7 +246,7 @@
}
/* }}} */
-/* {{{ proto bool pcntl_wifexited(long status)
+/* {{{ proto bool pcntl_wifexited(int status)
Returns true if the child status code represents a successful exit */
PHP_FUNCTION(pcntl_wifexited)
{
@@ -266,7 +266,7 @@
}
/* }}} */
-/* {{{ proto bool pcntl_wifstopped(long status)
+/* {{{ proto bool pcntl_wifstopped(int status)
Returns true if the child status code represents a stopped process (WUNTRACED must
have been used with waitpid) */
PHP_FUNCTION(pcntl_wifstopped)
{
@@ -286,7 +286,7 @@
}
/* }}} */
-/* {{{ proto bool pcntl_wifsignaled(long status)
+/* {{{ proto bool pcntl_wifsignaled(int status)
Returns true if the child status code represents a process that was terminated due
to a signal */
PHP_FUNCTION(pcntl_wifsignaled)
{
@@ -306,7 +306,7 @@
}
/* }}} */
-/* {{{ proto int pcntl_wexitstatus(long status)
+/* {{{ proto int pcntl_wexitstatus(int status)
Returns the status code of a child's exit */
PHP_FUNCTION(pcntl_wexitstatus)
{
@@ -329,7 +329,7 @@
}
/* }}} */
-/* {{{ proto int pcntl_wtermsig(long status)
+/* {{{ proto int pcntl_wtermsig(int status)
Returns the number of the signal that terminated the process who's status code is
passed */
PHP_FUNCTION(pcntl_wtermsig)
{
@@ -350,7 +350,7 @@
}
/* }}} */
-/* {{{ proto int pcntl_wstopsig(long status)
+/* {{{ proto int pcntl_wstopsig(int status)
Returns the number of the signal that caused the process to stop who's status code
is passed */
PHP_FUNCTION(pcntl_wstopsig)
{
@@ -466,7 +466,7 @@
}
/* }}} */
-/* {{{ proto bool pcntl_signal(long signo, callback handle, [bool restart_syscalls])
+/* {{{ proto bool pcntl_signal(int signo, callback handle [, bool restart_syscalls])
Assigns a system signal handler to a PHP function */
PHP_FUNCTION(pcntl_signal)
{
@@ -511,7 +511,7 @@
/* }}} */
#ifdef HAVE_GETPRIORITY
-/* {{{ proto int pcntl_getpriority(int pid, [int process_identifier]])
+/* {{{ proto int pcntl_getpriority([int pid [, int process_identifier]])
Get the priority of any process */
PHP_FUNCTION(pcntl_getpriority)
{
@@ -549,7 +549,7 @@
#endif
#ifdef HAVE_SETPRIORITY
-/* {{{ proto bool pcntl_setpriority(int priority, [int pid, [int process_identifier]])
+/* {{{ proto bool pcntl_setpriority(int priority [, int pid [, int
process_identifier]])
Change the priority of any process */
PHP_FUNCTION(pcntl_setpriority)
{
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.124 php4/ext/pdf/pdf.c:1.125
--- php4/ext/pdf/pdf.c:1.124 Tue Jun 10 16:03:34 2003
+++ php4/ext/pdf/pdf.c Sun Jun 22 10:33:04 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdf.c,v 1.124 2003/06/10 20:03:34 imajes Exp $ */
+/* $Id: pdf.c,v 1.125 2003/06/22 14:33:04 andrey Exp $ */
/* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -332,7 +332,7 @@
#else
php_info_print_table_row(2, "PDFlib GmbH Version", tmp );
#endif
- php_info_print_table_row(2, "Revision", "$Revision: 1.124 $" );
+ php_info_print_table_row(2, "Revision", "$Revision: 1.125 $" );
php_info_print_table_end();
}
@@ -383,7 +383,7 @@
}
/* }}} */
-/* {{{ proto bool pdf_set_info(int pdfdoc, string fieldname, string value)
+/* {{{ proto bool pdf_set_info(resource pdfdoc, string fieldname, string value)
Fills an info field of the document */
PHP_FUNCTION(pdf_set_info)
{
@@ -404,7 +404,7 @@
}
/* }}} */
-/* {{{ proto bool pdf_set_info_creator(int pdfdoc, string creator)
+/* {{{ proto bool pdf_set_info_creator(resource pdfdoc, string creator)
Fills the creator field of the document */
PHP_FUNCTION(pdf_set_info_creator)
{
@@ -412,7 +412,7 @@
}
/* }}} */
-/* {{{ proto bool pdf_set_info_title(int pdfdoc, string title)
+/* {{{ proto bool pdf_set_info_title(resource pdfdoc, string title)
Fills the title field of the document */
PHP_FUNCTION(pdf_set_info_title)
{
@@ -420,7 +420,7 @@
}
/* }}} */
-/* {{{ proto bool pdf_set_info_subject(int pdfdoc, string subject)
+/* {{{ proto bool pdf_set_info_subject(resource pdfdoc, string subject)
Fills the subject field of the document */
PHP_FUNCTION(pdf_set_info_subject)
{
@@ -428,7 +428,7 @@
}
/* }}} */
-/* {{{ proto bool pdf_set_info_author(int pdfdoc, string author)
+/* {{{ proto bool pdf_set_info_author(resource pdfdoc, string author)
Fills the author field of the document */
PHP_FUNCTION(pdf_set_info_author)
{
@@ -436,7 +436,7 @@
}
/* }}} */
-/* {{{ proto bool pdf_set_info_keywords(int pdfdoc, string keywords)
+/* {{{ proto bool pdf_set_info_keywords(resource pdfdoc, string keywords)
Fills the keywords field of the document */
PHP_FUNCTION(pdf_set_info_keywords)
{
@@ -444,7 +444,7 @@
}
/* }}} */
-/* {{{ proto resource pdf_open([int filedesc])
+/* {{{ proto resource pdf_open([resource filedesc])
Opens a new pdf document. If filedesc is NULL, document is created in memory. This
is the old interface, only for compatibility use pdf_new + pdf_open_file instead */
PHP_FUNCTION(pdf_open)
{
@@ -486,7 +486,7 @@
/* }}} */
-/* {{{ proto void pdf_close(int pdfdoc)
+/* {{{ proto bool pdf_close(resource pdfdoc)
Closes the pdf document */
PHP_FUNCTION(pdf_close)
{
@@ -506,7 +506,7 @@
/* }}} */
-/* {{{ proto void pdf_begin_page(int pdfdoc, float width, float height)
+/* {{{ proto bool pdf_begin_page(resource pdfdoc, float width, float height)
Starts page */
PHP_FUNCTION(pdf_begin_page)
{
@@ -526,7 +526,7 @@
}
/* }}} */
-/* {{{ proto void pdf_end_page(int pdfdoc)
+/* {{{ proto bool pdf_end_page(resource pdfdoc)
Ends page */
PHP_FUNCTION(pdf_end_page)
{
@@ -544,7 +544,7 @@
}
/* }}} */
-/* {{{ proto void pdf_show(int pdfdoc, string text)
+/* {{{ proto bool pdf_show(resource pdfdoc, string text)
Output text at current position */
PHP_FUNCTION(pdf_show)
{
@@ -563,7 +563,7 @@
}
/* }}} */
-/* {{{ proto void pdf_show_xy(int pdfdoc, string text, float x_koor, float y_koor)
+/* {{{ proto bool pdf_show_xy(resource pdfdoc, string text, float x_koor, float
y_koor)
Output text at position */
PHP_FUNCTION(pdf_show_xy)
{
@@ -584,7 +584,7 @@
}
/* }}} */
-/* {{{ proto int pdf_show_boxed(int pdfdoc, string text, float x_koor, float y_koor,
float width, float height, string mode [, string feature])
+/* {{{ proto int pdf_show_boxed(resource pdfdoc, string text, float x_koor, float
y_koor, float width, float height, string mode [, string feature])
Output text formated in a boxed */
PHP_FUNCTION(pdf_show_boxed)
{
@@ -626,7 +626,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_font(int pdfdoc, string font, float size, string encoding
[, int embed])
+/* {{{ proto bool pdf_set_font(resource pdfdoc, string font, float size, string
encoding [, int embed])
Select the current font face, size and encoding */
PHP_FUNCTION(pdf_set_font)
{
@@ -689,7 +689,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_value(int pdfdoc, string key, float value)
+/* {{{ proto bool pdf_set_value(resource pdfdoc, string key, float value)
Sets arbitrary value */
PHP_FUNCTION(pdf_set_value)
{
@@ -710,7 +710,7 @@
}
/* }}} */
-/* {{{ proto float pdf_get_value(int pdfdoc, string key, float modifier)
+/* {{{ proto float pdf_get_value(resource pdfdoc, string key, float modifier)
Gets arbitrary value */
PHP_FUNCTION(pdf_get_value)
{
@@ -764,7 +764,7 @@
}
/* }}} */
-/* {{{ proto int pdf_get_font(int pdfdoc)
+/* {{{ proto int pdf_get_font(resource pdfdoc)
Gets the current font */
PHP_FUNCTION(pdf_get_font)
{
@@ -783,7 +783,7 @@
}
/* }}} */
-/* {{{ proto string pdf_get_fontname(int pdfdoc)
+/* {{{ proto string pdf_get_fontname(resource pdfdoc)
Gets the current font name */
PHP_FUNCTION(pdf_get_fontname)
{
@@ -802,7 +802,7 @@
}
/* }}} */
-/* {{{ proto float pdf_get_fontsize(int pdfdoc)
+/* {{{ proto float pdf_get_fontsize(resource pdfdoc)
Gets the current font size */
PHP_FUNCTION(pdf_get_fontsize)
{
@@ -821,7 +821,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_leading(int pdfdoc, float distance)
+/* {{{ proto bool pdf_set_leading(resource pdfdoc, float distance)
Sets distance between text lines */
PHP_FUNCTION(pdf_set_leading)
{
@@ -829,7 +829,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_text_rendering(int pdfdoc, int mode)
+/* {{{ proto bool pdf_set_text_rendering(resource pdfdoc, int mode)
Determines how text is rendered */
PHP_FUNCTION(pdf_set_text_rendering)
{
@@ -837,7 +837,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_horiz_scaling(int pdfdoc, float scale)
+/* {{{ proto bool pdf_set_horiz_scaling(resource pdfdoc, float scale)
Sets horizontal scaling of text */
PHP_FUNCTION(pdf_set_horiz_scaling)
{
@@ -845,7 +845,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_text_rise(int pdfdoc, float value)
+/* {{{ proto bool pdf_set_text_rise(resource pdfdoc, float value)
Sets the text rise */
PHP_FUNCTION(pdf_set_text_rise)
{
@@ -853,7 +853,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_char_spacing(int pdfdoc, float space)
+/* {{{ proto bool pdf_set_char_spacing(resource pdfdoc, float space)
Sets character spacing */
PHP_FUNCTION(pdf_set_char_spacing)
{
@@ -861,7 +861,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_word_spacing(int pdfdoc, float space)
+/* {{{ proto bool pdf_set_word_spacing(resource pdfdoc, float space)
Sets spacing between words */
PHP_FUNCTION(pdf_set_word_spacing)
{
@@ -869,7 +869,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_text_pos(int pdfdoc, float x, float y)
+/* {{{ proto bool pdf_set_text_pos(resource pdfdoc, float x, float y)
Sets the position of text for the next pdf_show call */
PHP_FUNCTION(pdf_set_text_pos)
{
@@ -889,7 +889,7 @@
}
/* }}} */
-/* {{{ proto void pdf_continue_text(int pdfdoc, string text)
+/* {{{ proto bool pdf_continue_text(resource pdfdoc, string text)
Output text in next line */
PHP_FUNCTION(pdf_continue_text)
{
@@ -908,7 +908,7 @@
}
/* }}} */
-/* {{{ proto float pdf_stringwidth(int pdfdoc, string text [, int font, float size])
+/* {{{ proto float pdf_stringwidth(resource pdfdoc, string text [, int font, float
size])
Returns width of text in current font */
PHP_FUNCTION(pdf_stringwidth)
{
@@ -925,6 +925,7 @@
case 4:
if (zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) == FAILURE)
WRONG_PARAM_COUNT;
+ /* double convert_to_long_ex(arg3) - look below . is this needed ? */
convert_to_long_ex(arg3);
break;
default:
@@ -953,7 +954,7 @@
}
/* }}} */
-/* {{{ proto void pdf_save(int pdfdoc)
+/* {{{ proto bool pdf_save(resource pdfdoc)
Saves current enviroment */
PHP_FUNCTION(pdf_save)
{
@@ -971,7 +972,7 @@
}
/* }}} */
-/* {{{ proto void pdf_restore(int pdfdoc)
+/* {{{ proto bool pdf_restore(resource pdfdoc)
Restores formerly saved enviroment */
PHP_FUNCTION(pdf_restore)
{
@@ -989,7 +990,7 @@
}
/* }}} */
-/* {{{ proto void pdf_translate(int pdfdoc, float x, float y)
+/* {{{ proto bool pdf_translate(resource pdfdoc, float x, float y)
Sets origin of coordinate system */
PHP_FUNCTION(pdf_translate)
{
@@ -1009,7 +1010,7 @@
}
/* }}} */
-/* {{{ proto void pdf_scale(int pdfdoc, float x_scale, float y_scale)
+/* {{{ proto bool pdf_scale(resource pdfdoc, float x_scale, float y_scale)
Sets scaling */
PHP_FUNCTION(pdf_scale)
{
@@ -1029,7 +1030,7 @@
}
/* }}} */
-/* {{{ proto void pdf_rotate(int pdfdoc, float angle)
+/* {{{ proto bool pdf_rotate(resource pdfdoc, float angle)
Sets rotation */
PHP_FUNCTION(pdf_rotate)
{
@@ -1048,7 +1049,7 @@
}
/* }}} */
-/* {{{ proto void pdf_skew(int pdfdoc, float xangle, float yangle)
+/* {{{ proto bool pdf_skew(resource pdfdoc, float xangle, float yangle)
Skew the coordinate system */
PHP_FUNCTION(pdf_skew)
{
@@ -1068,7 +1069,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setflat(int pdfdoc, float value)
+/* {{{ proto bool pdf_setflat(resource pdfdoc, float value)
Sets flatness */
PHP_FUNCTION(pdf_setflat)
{
@@ -1094,7 +1095,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setlinejoin(int pdfdoc, int value)
+/* {{{ proto bool pdf_setlinejoin(resource pdfdoc, int value)
Sets linejoin parameter */
PHP_FUNCTION(pdf_setlinejoin)
{
@@ -1120,7 +1121,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setlinecap(int pdfdoc, int value)
+/* {{{ proto bool pdf_setlinecap(resource pdfdoc, int value)
Sets linecap parameter */
PHP_FUNCTION(pdf_setlinecap)
{
@@ -1146,7 +1147,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setmiterlimit(int pdfdoc, float value)
+/* {{{ proto bool pdf_setmiterlimit(resource pdfdoc, float value)
Sets miter limit */
PHP_FUNCTION(pdf_setmiterlimit)
{
@@ -1172,7 +1173,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setlinewidth(int pdfdoc, float width)
+/* {{{ proto bool pdf_setlinewidth(resource pdfdoc, float width)
Sets line width */
PHP_FUNCTION(pdf_setlinewidth)
{
@@ -1191,7 +1192,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setdash(int pdfdoc, float black, float white)
+/* {{{ proto bool pdf_setdash(resource pdfdoc, float black, float white)
Sets dash pattern */
PHP_FUNCTION(pdf_setdash)
{
@@ -1211,7 +1212,7 @@
}
/* }}} */
-/* {{{ proto void pdf_moveto(int pdfdoc, float x, float y)
+/* {{{ proto bool pdf_moveto(resource pdfdoc, float x, float y)
Sets current point */
PHP_FUNCTION(pdf_moveto)
{
@@ -1231,7 +1232,7 @@
}
/* }}} */
-/* {{{ proto void pdf_curveto(int pdfdoc, float x1, float y1, float x2, float y2,
float x3, float y3)
+/* {{{ proto bool pdf_curveto(resource pdfdoc, float x1, float y1, float x2, float
y2, float x3, float y3)
Draws a curve */
PHP_FUNCTION(pdf_curveto)
{
@@ -1262,7 +1263,7 @@
}
/* }}} */
-/* {{{ proto void pdf_lineto(int pdfdoc, float x, float y)
+/* {{{ proto bool pdf_lineto(resource pdfdoc, float x, float y)
Draws a line */
PHP_FUNCTION(pdf_lineto)
{
@@ -1282,7 +1283,7 @@
}
/* }}} */
-/* {{{ proto void pdf_circle(int pdfdoc, float x, float y, float radius)
+/* {{{ proto bool pdf_circle(resource pdfdoc, float x, float y, float radius)
Draws a circle */
PHP_FUNCTION(pdf_circle)
{
@@ -1303,7 +1304,7 @@
}
/* }}} */
-/* {{{ proto void pdf_arc(int pdfdoc, float x, float y, float radius, float start,
float end)
+/* {{{ proto bool pdf_arc(resource pdfdoc, float x, float y, float radius, float
start, float end)
Draws an arc */
PHP_FUNCTION(pdf_arc)
{
@@ -1332,7 +1333,7 @@
}
/* }}} */
-/* {{{ proto void pdf_rect(int pdfdoc, float x, float y, float width, float height)
+/* {{{ proto bool pdf_rect(resource pdfdoc, float x, float y, float width, float
height)
Draws a rectangle */
PHP_FUNCTION(pdf_rect)
{
@@ -1359,7 +1360,7 @@
}
/* }}} */
-/* {{{ proto void pdf_closepath(int pdfdoc)
+/* {{{ proto bool pdf_closepath(resource pdfdoc)
Close path */
PHP_FUNCTION(pdf_closepath)
{
@@ -1377,7 +1378,7 @@
}
/* }}} */
-/* {{{ proto void pdf_closepath_stroke(int pdfdoc)
+/* {{{ proto bool pdf_closepath_stroke(resource pdfdoc)
Close path and draw line along path */
PHP_FUNCTION(pdf_closepath_stroke)
{
@@ -1395,7 +1396,7 @@
}
/* }}} */
-/* {{{ proto void pdf_stroke(int pdfdoc)
+/* {{{ proto bool pdf_stroke(resource pdfdoc)
Draw line along path path */
PHP_FUNCTION(pdf_stroke)
{
@@ -1413,7 +1414,7 @@
}
/* }}} */
-/* {{{ proto void pdf_fill(int pdfdoc)
+/* {{{ proto bool pdf_fill(resource pdfdoc)
Fill current path */
PHP_FUNCTION(pdf_fill)
{
@@ -1431,7 +1432,7 @@
}
/* }}} */
-/* {{{ proto void pdf_fill_stroke(int pdfdoc)
+/* {{{ proto bool pdf_fill_stroke(resource pdfdoc)
Fill and stroke current path */
PHP_FUNCTION(pdf_fill_stroke)
{
@@ -1449,7 +1450,7 @@
}
/* }}} */
-/* {{{ proto void pdf_closepath_fill_stroke(int pdfdoc)
+/* {{{ proto bool pdf_closepath_fill_stroke(resource pdfdoc)
Close, fill and stroke current path */
PHP_FUNCTION(pdf_closepath_fill_stroke)
{
@@ -1467,7 +1468,7 @@
}
/* }}} */
-/* {{{ proto void pdf_endpath(int pdfdoc)
+/* {{{ proto bool pdf_endpath(resource pdfdoc)
Ends current path */
PHP_FUNCTION(pdf_endpath)
{
@@ -1485,7 +1486,7 @@
}
/* }}} */
-/* {{{ proto void pdf_clip(int pdfdoc)
+/* {{{ proto bool pdf_clip(resource pdfdoc)
Clips to current path */
PHP_FUNCTION(pdf_clip)
{
@@ -1503,7 +1504,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_parameter(int pdfdoc, string key, string value)
+/* {{{ proto bool pdf_set_parameter(resource pdfdoc, string key, string value)
Sets arbitrary parameters */
PHP_FUNCTION(pdf_set_parameter)
{
@@ -1524,7 +1525,7 @@
}
/* }}} */
-/* {{{ proto string pdf_get_parameter(int pdfdoc, string key, mixed modifier)
+/* {{{ proto string pdf_get_parameter(resource pdfdoc, string key, mixed modifier)
Gets arbitrary parameters */
PHP_FUNCTION(pdf_get_parameter)
{
@@ -1551,7 +1552,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setgray_fill(int pdfdoc, float value)
+/* {{{ proto bool pdf_setgray_fill(resource pdfdoc, float value)
Sets filling color to gray value */
PHP_FUNCTION(pdf_setgray_fill)
{
@@ -1574,7 +1575,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setgray_stroke(int pdfdoc, float value)
+/* {{{ proto bool pdf_setgray_stroke(resource pdfdoc, float value)
Sets drawing color to gray value */
PHP_FUNCTION(pdf_setgray_stroke)
{
@@ -1597,7 +1598,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setgray(int pdfdoc, float value)
+/* {{{ proto bool pdf_setgray(resource pdfdoc, float value)
Sets drawing and filling color to gray value */
PHP_FUNCTION(pdf_setgray)
{
@@ -1620,7 +1621,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setrgbcolor_fill(int pdfdoc, float red, float green, float blue)
+/* {{{ proto bool pdf_setrgbcolor_fill(resource pdfdoc, float red, float green, float
blue)
Sets filling color to RGB color value */
PHP_FUNCTION(pdf_setrgbcolor_fill)
{
@@ -1645,7 +1646,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setrgbcolor_stroke(int pdfdoc, float red, float green, float
blue)
+/* {{{ proto bool pdf_setrgbcolor_stroke(resource pdfdoc, float red, float green,
float blue)
Sets drawing color to RGB color value */
PHP_FUNCTION(pdf_setrgbcolor_stroke)
{
@@ -1670,7 +1671,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setrgbcolor(int pdfdoc, float red, float green, float blue)
+/* {{{ proto bool pdf_setrgbcolor(resource pdfdoc, float red, float green, float blue)
Sets drawing and filling color to RGB color value */
PHP_FUNCTION(pdf_setrgbcolor)
{
@@ -1695,7 +1696,7 @@
}
/* }}} */
-/* {{{ proto int pdf_add_bookmark(int pdfdoc, string text [, int parent, int open])
+/* {{{ proto int pdf_add_bookmark(resource pdfdoc, string text [, int parent [, int
open]])
Adds bookmark for current page */
PHP_FUNCTION(pdf_add_bookmark)
{
@@ -1749,7 +1750,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_transition(int pdfdoc, int transition)
+/* {{{ proto bool pdf_set_transition(resource pdfdoc, int transition)
Sets transition between pages */
PHP_FUNCTION(pdf_set_transition)
{
@@ -1797,7 +1798,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_duration(int pdfdoc, float duration)
+/* {{{ proto bool pdf_set_duration(resource pdfdoc, float duration)
Sets duration between pages */
PHP_FUNCTION(pdf_set_duration)
{
@@ -1849,7 +1850,7 @@
}
/* }}} */
-/* {{{ proto int pdf_open_gif(int pdf, string giffile)
+/* {{{ proto int pdf_open_gif(resource pdf, string giffile)
Opens a GIF file and returns an image for placement in a pdf object */
PHP_FUNCTION(pdf_open_gif)
{
@@ -1857,7 +1858,7 @@
}
/* }}} */
-/* {{{ proto int pdf_open_jpeg(int pdf, string jpegfile)
+/* {{{ proto int pdf_open_jpeg(resource pdf, string jpegfile)
Opens a JPEG file and returns an image for placement in a PDF document */
PHP_FUNCTION(pdf_open_jpeg)
{
@@ -1865,7 +1866,7 @@
}
/* }}} */
-/* {{{ proto int pdf_open_png(int pdf, string pngfile)
+/* {{{ proto int pdf_open_png(resource pdf, string pngfile)
Opens a PNG file and returns an image for placement in a PDF document */
PHP_FUNCTION(pdf_open_png)
{
@@ -1873,7 +1874,7 @@
}
/* }}} */
-/* {{{ proto int pdf_open_tiff(int pdf, string tifffile)
+/* {{{ proto int pdf_open_tiff(resource pdf, string tifffile)
Opens a TIFF file and returns an image for placement in a PDF document */
PHP_FUNCTION(pdf_open_tiff)
{
@@ -1881,7 +1882,7 @@
}
/* }}} */
-/* {{{ proto int pdf_open_image_file(int pdf, string type, string file, string
stringparam, int intparam)
+/* {{{ proto int pdf_open_image_file(resource pdf, string type, string file [, string
stringparam, int intparam])
Opens an image file of the given type and returns an image for placement in a PDF
document */
PHP_FUNCTION(pdf_open_image_file)
{
@@ -1948,7 +1949,7 @@
/* }}} */
#if HAVE_LIBGD13
-/* {{{ proto int pdf_open_memory_image(int pdf, int image)
+/* {{{ proto int pdf_open_memory_image(resource pdf, resource image)
Takes an GD image and returns an image for placement in a PDF document */
PHP_FUNCTION(pdf_open_memory_image)
{
@@ -2015,7 +2016,7 @@
/* }}} */
#endif /* HAVE_LIBGD13 */
-/* {{{ proto void pdf_close_image(int pdf, int pdfimage)
+/* {{{ proto void pdf_close_image(resource pdf, int pdfimage)
Closes the PDF image */
PHP_FUNCTION(pdf_close_image)
{
@@ -2033,7 +2034,7 @@
}
/* }}} */
-/* {{{ proto void pdf_place_image(int pdf, int pdfimage, float x, float y, float
scale)
+/* {{{ proto bool pdf_place_image(resource pdf, int pdfimage, float x, float y, float
scale)
Places image in the PDF document */
PHP_FUNCTION(pdf_place_image)
{
@@ -2056,7 +2057,7 @@
}
/* }}} */
-/* {{{ proto int pdf_get_image_width(int pdf, int pdfimage)
+/* {{{ proto int pdf_get_image_width(resource pdf, int pdfimage)
Returns the width of an image */
PHP_FUNCTION(pdf_get_image_width)
{
@@ -2076,7 +2077,7 @@
}
/* }}} */
-/* {{{ proto int pdf_get_image_height(int pdf, int pdfimage)
+/* {{{ proto int pdf_get_image_height(resource pdf, int pdfimage)
Returns the height of an image */
PHP_FUNCTION(pdf_get_image_height)
{
@@ -2096,7 +2097,7 @@
}
/* }}} */
-/* {{{ proto void pdf_add_weblink(int pdfdoc, float llx, float lly, float urx, float
ury, string url)
+/* {{{ proto bool pdf_add_weblink(resource pdfdoc, float llx, float lly, float urx,
float ury, string url)
Adds link to web resource */
PHP_FUNCTION(pdf_add_weblink)
{
@@ -2123,7 +2124,7 @@
}
/* }}} */
-/* {{{ proto void pdf_add_pdflink(int pdfdoc, float llx, float lly, float urx, float
ury, string filename, int page, string dest)
+/* {{{ proto bool pdf_add_pdflink(resource pdfdoc, float llx, float lly, float urx,
float ury, string filename, int page, string dest)
Adds link to PDF document */
PHP_FUNCTION(pdf_add_pdflink)
{
@@ -2155,7 +2156,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_border_style(int pdfdoc, string style, float width)
+/* {{{ proto bool pdf_set_border_style(resource pdfdoc, string style, float width)
Sets style of box surounding all kinds of annotations and link */
PHP_FUNCTION(pdf_set_border_style)
{
@@ -2175,7 +2176,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_border_color(int pdfdoc, float red, float green, float blue)
+/* {{{ proto bool pdf_set_border_color(resource pdfdoc, float red, float green, float
blue)
Sets color of box surounded all kinds of annotations and links */
PHP_FUNCTION(pdf_set_border_color)
{
@@ -2196,7 +2197,7 @@
}
/* }}} */
-/* {{{ proto void pdf_set_border_dash(int pdfdoc, float black, float white)
+/* {{{ proto bool pdf_set_border_dash(resource pdfdoc, float black, float white)
Sets the border dash style of all kinds of annotations and links */
PHP_FUNCTION(pdf_set_border_dash)
{
@@ -2216,7 +2217,7 @@
}
/* }}} */
-/* {{{ proto void pdf_add_annotation(int pdfdoc, float xll, float yll, float xur,
float xur, string title, string text)
+/* {{{ proto bool pdf_add_annotation(resource pdfdoc, float xll, float yll, float
xur, float xur, string title, string text)
Sets annotation (depreciated use pdf_add_note instead) */
PHP_FUNCTION(pdf_add_annotation)
{
@@ -2290,7 +2291,7 @@
}
/* }}} */
-/* {{{ proto bool pdf_delete(int pdfdoc)
+/* {{{ proto bool pdf_delete(resource pdfdoc)
Deletes the PDF object */
PHP_FUNCTION(pdf_delete)
{
@@ -2308,7 +2309,7 @@
}
/* }}} */
-/* {{{ proto int pdf_open_file(int pdfdoc [, char filename])
+/* {{{ proto bool pdf_open_file(resource pdfdoc [, string filename])
Opens a new PDF document. If filename is NULL, document is created in memory. This
is not yet fully supported */
PHP_FUNCTION(pdf_open_file)
@@ -2353,7 +2354,7 @@
}
/* }}} */
-/* {{{ proto string pdf_get_buffer(int pdfdoc)
+/* {{{ proto string pdf_get_buffer(resource pdfdoc)
Fetches the full buffer containig the generated PDF data */
PHP_FUNCTION(pdf_get_buffer)
{
@@ -2374,7 +2375,7 @@
}
/* }}} */
-/* {{{ proto int pdf_findfont(int pdfdoc, string fontname, string encoding [, int
embed])
+/* {{{ proto int pdf_findfont(resource pdfdoc, string fontname, string encoding [,
int embed])
Prepares the font fontname for later use with pdf_setfont() */
PHP_FUNCTION(pdf_findfont)
{
@@ -2421,7 +2422,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setfont(int pdfdoc, int font, float fontsize)
+/* {{{ proto bool pdf_setfont(resource pdfdoc, int font, float fontsize)
Sets the current font in the fiven fontsize */
PHP_FUNCTION(pdf_setfont)
{
@@ -2449,7 +2450,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setpolydash(int pdfdoc, float darray)
+/* {{{ proto bool pdf_setpolydash(resource pdfdoc, float darray)
Sets more complicated dash pattern */
PHP_FUNCTION(pdf_setpolydash)
@@ -2494,7 +2495,7 @@
}
/* }}} */
-/* {{{ proto void pdf_concat(int pdf, float a, float b, float c, float d, float e,
float f)
+/* {{{ proto bool pdf_concat(resource pdf, float a, float b, float c, float d, float
e, float f)
Concatenates a matrix to the current transformation matrix for text and graphics */
PHP_FUNCTION(pdf_concat)
{
@@ -2526,7 +2527,7 @@
}
/* }}} */
-/* {{{ proto int pdf_open_ccitt(int pdf, string filename, int width, int height, int
bitreverse, int k, int blackls1)
+/* {{{ proto int pdf_open_ccitt(resource pdf, string filename, int width, int height,
int bitreverse, int k, int blackls1)
Opens an image file with raw CCITT G3 or G4 compresed bitmap data */
PHP_FUNCTION(pdf_open_ccitt)
{
@@ -2570,7 +2571,7 @@
}
/* }}} */
-/* {{{ proto int pdf_open_image(int pdf, string type, string source, string data,
long length, int width, int height, int components, int bpc, string params)
+/* {{{ proto int pdf_open_image(resource pdf, string type, string source, string
data, long length, int width, int height, int components, int bpc, string params)
Opens an image of the given type and returns an image for placement in a PDF
document */
PHP_FUNCTION(pdf_open_image)
{
@@ -2620,7 +2621,7 @@
}
/* }}} */
-/* {{{ proto void pdf_attach_file(int pdf, float lly, float lly, float urx, float
ury, string filename, string description, string author, string mimetype, string icon)
+/* {{{ proto bool pdf_attach_file(resource pdf, float lly, float lly, float urx,
float ury, string filename, string description, string author, string mimetype, string
icon)
Adds a file attachment annotation at the rectangle specified by his lower left and
upper right corners */
PHP_FUNCTION(pdf_attach_file)
{
@@ -2662,7 +2663,7 @@
}
/* }}} */
-/* {{{ proto void pdf_add_note(int pdfdoc, float llx, float lly, float urx, float
ury, string contents, string title, string icon, int open)
+/* {{{ proto bool pdf_add_note(resource pdfdoc, float llx, float lly, float urx,
float ury, string contents, string title, string icon, int open)
Sets annotation */
PHP_FUNCTION(pdf_add_note)
{
@@ -2698,7 +2699,7 @@
}
/* }}} */
-/* {{{ proto void pdf_add_locallink(int pdfdoc, float llx, float lly, float urx,
float ury, int page, string dest)
+/* {{{ proto bool pdf_add_locallink(resource pdfdoc, float llx, float lly, float urx,
float ury, int page, string dest)
Adds link to web resource */
PHP_FUNCTION(pdf_add_locallink)
{
@@ -2730,7 +2731,7 @@
}
/* }}} */
-/* {{{ proto void pdf_add_launchlink(int pdfdoc, float llx, float lly, float urx,
float ury, string filename)
+/* {{{ proto bool pdf_add_launchlink(resource pdfdoc, float llx, float lly, float
urx, float ury, string filename)
Adds link to web resource */
PHP_FUNCTION(pdf_add_launchlink)
{
@@ -2762,7 +2763,7 @@
#if (PDFLIB_MAJORVERSION >= 4)
-/* {{{ proto int pdf_open_pdi(int pdf, string filename, string stringparam, int
intparam);
+/* {{{ proto int pdf_open_pdi(resource pdf, string filename, string stringparam, int
intparam);
* Open an existing PDF document and prepare it for later use. */
PHP_FUNCTION(pdf_open_pdi)
{
@@ -2800,7 +2801,7 @@
}
/* }}} */
-/* {{{ proto void pdf_close_pdi(int pdf, int doc);
+/* {{{ proto bool pdf_close_pdi(resource pdf, int doc);
* Close all open page handles, and close the input PDF document. */
PHP_FUNCTION(pdf_close_pdi)
{
@@ -2815,14 +2816,13 @@
convert_to_long_ex(arg2);
- PDF_close_pdi(pdf,
- Z_LVAL_PP(arg2)-PDFLIB_PDI_OFFSET);
+ PDF_close_pdi(pdf, Z_LVAL_PP(arg2)-PDFLIB_PDI_OFFSET);
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto int pdf_open_pdi_page(int pdf, int doc, int page, string label);
+/* {{{ proto int pdf_open_pdi_page(resource pdf, int doc, int page, string label);
* Prepare a page for later use with PDF_place_image(). */
PHP_FUNCTION(pdf_open_pdi_page)
{
@@ -2849,7 +2849,7 @@
}
/* }}} */
-/* {{{ proto void pdf_place_pdi_page(int pdf, int page, float x, float y, float sx,
float sy)
+/* {{{ proto bool pdf_place_pdi_page(resource pdf, int page, float x, float y, float
sx, float sy)
* Place a PDF page with the lower left corner at (x, y), and scale it. */
PHP_FUNCTION(pdf_place_pdi_page)
{
@@ -2879,7 +2879,7 @@
}
/* }}} */
-/* {{{ proto void pdf_close_pdi_page(int pdf, int page);
+/* {{{ proto bool pdf_close_pdi_page(resource pdf, int page);
* Close the page handle, and free all page-related resources. */
PHP_FUNCTION(pdf_close_pdi_page)
{
@@ -2894,14 +2894,13 @@
convert_to_long_ex(arg2);
- PDF_close_pdi_page(pdf,
- Z_LVAL_PP(arg2)-PDFLIB_IMAGE_OFFSET);
+ PDF_close_pdi_page(pdf, Z_LVAL_PP(arg2)-PDFLIB_IMAGE_OFFSET);
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto string pdf_get_pdi_parameter(int pdf, string key, int doc, int page, int
index);
+/* {{{ proto string pdf_get_pdi_parameter(resource pdf, string key, int doc, int
page, int index);
* Get the contents of some PDI document parameter with string type. */
PHP_FUNCTION(pdf_get_pdi_parameter)
{
@@ -2932,7 +2931,7 @@
}
/* }}} */
-/* {{{ proto float pdf_get_pdi_value(int pdf, string key, int doc, int page, int
index);
+/* {{{ proto float pdf_get_pdi_value(resource pdf, string key, int doc, int page, int
index);
* Get the contents of some PDI document parameter with numerical type. */
PHP_FUNCTION(pdf_get_pdi_value)
{
@@ -2961,7 +2960,7 @@
}
/* }}} */
-/* {{{ proto int pdf_begin_pattern(int pdf, float width, float height, float xstep,
float ystep, int painttype);
+/* {{{ proto int pdf_begin_pattern(resource pdf, float width, float height, float
xstep, float ystep, int painttype);
* Start a new pattern definition. */
PHP_FUNCTION(pdf_begin_pattern)
{
@@ -2992,7 +2991,7 @@
}
/* }}} */
-/* {{{ proto void pdf_end_pattern(int pdf);
+/* {{{ proto bool pdf_end_pattern(resource pdf);
* Finish the pattern definition. */
PHP_FUNCTION(pdf_end_pattern)
{
@@ -3011,7 +3010,7 @@
}
/* }}} */
-/* {{{ proto int pdf_begin_template(int pdf, float width, float height);
+/* {{{ proto int pdf_begin_template(resource pdf, float width, float height);
* Start a new template definition. */
PHP_FUNCTION(pdf_begin_template)
{
@@ -3036,7 +3035,7 @@
}
/* }}} */
-/* {{{ proto void pdf_end_template(int pdf);
+/* {{{ proto bool pdf_end_template(resource pdf);
* Finish the template definition. */
PHP_FUNCTION(pdf_end_template)
{
@@ -3056,7 +3055,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setcolor(int pdf, string type, string colorspace, float c1 [,
float c2 [, float c3 [, float c4]]]);
+/* {{{ proto bool pdf_setcolor(resource pdf, string type, string colorspace, float c1
[, float c2 [, float c3 [, float c4]]]);
* Set the current color space and color. */
PHP_FUNCTION(pdf_setcolor)
{
@@ -3120,7 +3119,7 @@
}
/* }}} */
-/* {{{ proto int pdf_makespotcolor(int pdf, string spotname);
+/* {{{ proto int pdf_makespotcolor(resource pdf, string spotname);
* Make a named spot color from the current color. */
PHP_FUNCTION(pdf_makespotcolor)
{
@@ -3144,7 +3143,7 @@
}
/* }}} */
-/* {{{ proto void pdf_arcn(int pdf, float x, float y, float r, float alpha, float
beta);
+/* {{{ proto bool pdf_arcn(resource pdf, float x, float y, float r, float alpha,
float beta);
* Draw a clockwise circular arc from alpha to beta degrees. */
PHP_FUNCTION(pdf_arcn)
{
@@ -3174,7 +3173,7 @@
}
/* }}} */
-/* {{{ proto void pdf_initgraphics(int pdf);
+/* {{{ proto bool pdf_initgraphics(resource pdf);
* Reset all implicit color and graphics state parameters to their defaults. */
PHP_FUNCTION(pdf_initgraphics)
{
@@ -3193,7 +3192,7 @@
}
/* }}} */
-/* {{{ proto void pdf_add_thumbnail(int pdf, int image);
+/* {{{ proto bool pdf_add_thumbnail(resource pdf, int image);
* Add an existing image as thumbnail for the current page. */
PHP_FUNCTION(pdf_add_thumbnail)
{
@@ -3215,7 +3214,7 @@
}
/* }}} */
-/* {{{ proto void pdf_setmatrix(int pdf, float a, float b, float c, float d, float e,
float f)
+/* {{{ proto bool pdf_setmatrix(resource pdf, float a, float b, float c, float d,
float e, float f)
Explicitly set the current transformation matrix. */
PHP_FUNCTION(pdf_setmatrix)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
