maxim Sun Nov 10 00:31:12 2002 EDT
Modified files:
/php4/ext/oci8 oci8.c
Log:
fixed several proto return types throughout the extension
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.182 php4/ext/oci8/oci8.c:1.183
--- php4/ext/oci8/oci8.c:1.182 Thu Oct 24 09:14:40 2002
+++ php4/ext/oci8/oci8.c Sun Nov 10 00:31:12 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.182 2002/10/24 13:14:40 sas Exp $ */
+/* $Id: oci8.c,v 1.183 2002/11/10 05:31:12 maxim Exp $ */
/* TODO list:
*
@@ -627,7 +627,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.182 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.183 $");
#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 );
@@ -2702,7 +2702,7 @@
/************************* EXTENSION FUNCTIONS *************************/
-/* {{{ proto int ocidefinebyname(int stmt, string name, mixed &var [, int type])
+/* {{{ proto bool ocidefinebyname(int 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!!!
*/
@@ -2761,7 +2761,7 @@
/* }}} */
-/* {{{ proto int ocibindbyname(int stmt, string name, mixed &var, [, int maxlength]
[, int type])
+/* {{{ proto bool ocibindbyname(int 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!!!
*/
@@ -2939,7 +2939,7 @@
/* }}} */
-/* {{{ proto string ocifreedesc(object lob)
+/* {{{ proto bool ocifreedesc(object lob)
Deletes large object description */
PHP_FUNCTION(ocifreedesc)
@@ -2963,7 +2963,7 @@
}
/* }}} */
-/* {{{ proto string ocisavelob(object lob)
+/* {{{ proto bool ocisavelob(object lob)
Saves a large object */
PHP_FUNCTION(ocisavelob)
@@ -3054,7 +3054,7 @@
/* }}} */
-/* {{{ proto string ocisavelobfile(object lob)
+/* {{{ proto bool ocisavelobfile(object lob)
Saves a large object file */
PHP_FUNCTION(ocisavelobfile)
@@ -3160,7 +3160,7 @@
}
/* }}} */
-/* {{{ proto void ociwritelobtofile(object lob [, string filename] [, int start] [,
int length])
+/* {{{ proto bool ociwritelobtofile(object lob [, string filename] [, int start] [,
+int length])
Writes a large object into a file */
PHP_FUNCTION(ociwritelobtofile)
@@ -3346,7 +3346,7 @@
/* }}} */
#ifdef HAVE_OCI8_TEMP_LOB
-/* {{{ proto int ociwritetemporarylob(int stmt, int loc, string var)
+/* {{{ proto bool ociwritetemporarylob(int stmt, int loc, string var)
Return the row count of an OCI statement */
PHP_FUNCTION(ociwritetemporarylob)
@@ -3443,7 +3443,7 @@
/* }}} */
-/* {{{ proto string ocicloselob(object lob)
+/* {{{ proto bool ocicloselob(object lob)
Closes lob descriptor */
PHP_FUNCTION(ocicloselob)
@@ -3540,7 +3540,7 @@
/* }}} */
-/* {{{ proto string ocirollback(int conn)
+/* {{{ proto bool ocirollback(int conn)
Rollback the current context */
PHP_FUNCTION(ocirollback)
@@ -3576,7 +3576,7 @@
/* }}} */
-/* {{{ proto string ocicommit(int conn)
+/* {{{ proto bool ocicommit(int conn)
Commit the current context */
PHP_FUNCTION(ocicommit)
@@ -3815,7 +3815,7 @@
/* }}} */
-/* {{{ proto int ocicolumnisnull(int stmt, int col)
+/* {{{ proto bool ocicolumnisnull(int stmt, int col)
Tell whether a column is NULL */
PHP_FUNCTION(ocicolumnisnull)
@@ -3891,7 +3891,7 @@
/* }}} */
-/* {{{ proto int ocicancel(int stmt)
+/* {{{ proto bool ocicancel(int stmt)
Prepare a new row of data for reading */
PHP_FUNCTION(ocicancel)
@@ -3914,7 +3914,7 @@
/* }}} */
-/* {{{ proto int ocifetch(int stmt)
+/* {{{ proto bool ocifetch(int stmt)
Prepare a new row of data for reading */
PHP_FUNCTION(ocifetch)
@@ -4139,7 +4139,7 @@
/* }}} */
-/* {{{ proto int ocifreestatement(int stmt)
+/* {{{ proto bool ocifreestatement(int stmt)
Free all resources associated with a statement */
PHP_FUNCTION(ocifreestatement)
@@ -4160,7 +4160,7 @@
/* }}} */
-/* {{{ proto int ocilogoff(int conn)
+/* {{{ proto bool ocilogoff(int conn)
Disconnect from database */
PHP_FUNCTION(ocilogoff)
@@ -4476,7 +4476,7 @@
/* }}} */
-/* {{{ proto int ocistatementtype(int stmt)
+/* {{{ proto string ocistatementtype(int stmt)
Return the query type of an OCI statement */
/* XXX it would be better with a general interface to OCIAttrGet() */
@@ -4593,7 +4593,7 @@
}
/* }}} */
-/* {{{ proto string ocifreecollection(object lob)
+/* {{{ proto bool ocifreecollection(object lob)
Deletes collection object*/
PHP_FUNCTION(ocifreecollection)
@@ -4633,7 +4633,7 @@
}
/* }}} */
-/* {{{ proto string ocicollappend(object collection,value)
+/* {{{ proto bool ocicollappend(object collection,value)
Append an object to the collection */
PHP_FUNCTION(ocicollappend)
@@ -4885,7 +4885,7 @@
}
/* }}} */
-/* {{{ proto string ocicollassign(object collection,object)
+/* {{{ proto bool ocicollassign(object collection,object)
Assign a collection from another existing collection */
PHP_FUNCTION(ocicollassign)
@@ -4927,7 +4927,7 @@
}
/* }}} */
-/* {{{ proto string ocicollassignelem(object collection,ndx,val)
+/* {{{ proto bool ocicollassignelem(object collection,ndx,val)
Assign element val to collection at index ndx */
PHP_FUNCTION(ocicollassignelem)
@@ -5090,7 +5090,7 @@
}
/* }}} */
-/* {{{ proto string ocicollsize(object collection)
+/* {{{ proto int ocicollsize(object collection)
Return the size of a collection */
PHP_FUNCTION(ocicollsize)
@@ -5117,13 +5117,14 @@
oci_error(connection->pError, "OCICollSize",
connection->error);
RETURN_FALSE;
}
+
RETURN_LONG(sz);
}
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string ocicollmax(object collection)
+/* {{{ proto int ocicollmax(object collection)
Return the max value of a collection. For a varray this is the maximum length of
the array */
PHP_FUNCTION(ocicollmax)
@@ -5145,7 +5146,7 @@
}
/* }}} */
-/* {{{ proto string ocicolltrim(object collection,num)
+/* {{{ proto bool ocicolltrim(object collection,num)
Trim num elements from the end of a collection */
PHP_FUNCTION(ocicolltrim)
@@ -5179,7 +5180,7 @@
}
/* }}} */
-/* {{{ proto string ocinewcollection(int connection, string tdo,[string schema])
+/* {{{ proto bool ocinewcollection(int connection, string tdo,[string schema])
Initialize a new collection */
PHP_FUNCTION(ocinewcollection)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
