tony2001 Mon Feb 12 09:36:11 2007 UTC
Modified files:
/php-src/ext/oci8 oci8.c config.m4 php_oci8_int.h
Log:
typofixes and other improvements by Chris Jones
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.328&r2=1.329&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.328 php-src/ext/oci8/oci8.c:1.329
--- php-src/ext/oci8/oci8.c:1.328 Wed Jan 31 12:45:55 2007
+++ php-src/ext/oci8/oci8.c Mon Feb 12 09:36:11 2007
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.328 2007/01/31 12:45:55 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.329 2007/02/12 09:36:11 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -674,7 +674,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", "1.2.2");
- php_info_print_table_row(2, "Revision", "$Revision: 1.328 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.329 $");
sprintf(buf, "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1088,7 +1088,7 @@
size_t rsize = 0;
sword result;
- PHP_OCI_CALL_RETURN(result,
OCINlsEnvironmentVariableGet, (&charsetid_nls_lang, 0, OCI_NLS_CHARSET_ID, 0,
&rsize))
+ PHP_OCI_CALL_RETURN(result,
OCINlsEnvironmentVariableGet, (&charsetid_nls_lang, 0, OCI_NLS_CHARSET_ID, 0,
&rsize));
if (result != OCI_SUCCESS) {
charsetid_nls_lang = 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.62&r2=1.63&diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.62 php-src/ext/oci8/config.m4:1.63
--- php-src/ext/oci8/config.m4:1.62 Thu Jun 22 20:28:51 2006
+++ php-src/ext/oci8/config.m4 Mon Feb 12 09:36:11 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.62 2006/06/22 20:28:51 tony2001 Exp $
+dnl $Id: config.m4,v 1.63 2007/02/12 09:36:11 tony2001 Exp $
dnl
if test -z "$SED"; then
@@ -99,7 +99,7 @@
[ --with-oci8[=DIR] Include Oracle (OCI8) support.
The default DIR is ORACLE_HOME.
Use --with-oci8=instantclient,/path/to/oic/lib
- to use Oracle Instant Client installation])
+ to use an Oracle Instant Client installation])
AC_MSG_CHECKING([checking PHP version])
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8_int.h?r1=1.30&r2=1.31&diff_format=u
Index: php-src/ext/oci8/php_oci8_int.h
diff -u php-src/ext/oci8/php_oci8_int.h:1.30
php-src/ext/oci8/php_oci8_int.h:1.31
--- php-src/ext/oci8/php_oci8_int.h:1.30 Wed Jan 31 10:36:20 2007
+++ php-src/ext/oci8/php_oci8_int.h Mon Feb 12 09:36:11 2007
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_oci8_int.h,v 1.30 2007/01/31 10:36:20 tony2001 Exp $ */
+/* $Id: php_oci8_int.h,v 1.31 2007/02/12 09:36:11 tony2001 Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_INT_H
@@ -231,41 +231,47 @@
/* {{{ macros */
#define PHP_OCI_CALL(func, params) \
- OCI_G(in_call) = 1; \
- func params; \
- OCI_G(in_call) = 0; \
- if (OCI_G(debug_mode)) { \
- php_printf ("OCI8 DEBUG: " #func " at (%s:%d) \n", __FILE__,
__LINE__); \
- }
+ do { \
+ OCI_G(in_call) = 1; \
+ func params; \
+ OCI_G(in_call) = 0; \
+ if (OCI_G(debug_mode)) { \
+ php_printf ("OCI8 DEBUG: " #func " at (%s:%d) \n",
__FILE__, __LINE__); \
+ } \
+ } while (0)
#define PHP_OCI_CALL_RETURN(__retval, func, params) \
- OCI_G(in_call) = 1; \
- __retval = func params; \
- OCI_G(in_call) = 0; \
- if (OCI_G(debug_mode)) { \
- php_printf ("OCI8 DEBUG: " #func " at (%s:%d) \n", __FILE__,
__LINE__); \
- }
+ do { \
+ OCI_G(in_call) = 1; \
+ __retval = func params; \
+ OCI_G(in_call) = 0; \
+ if (OCI_G(debug_mode)) { \
+ php_printf ("OCI8 DEBUG: " #func " at (%s:%d) \n",
__FILE__, __LINE__); \
+ } \
+ } while (0)
#define PHP_OCI_HANDLE_ERROR(connection, errcode) \
-{ \
- switch (errcode) { \
- case 1013: \
- zend_bailout(); \
+ do { \
+ switch (errcode) { \
+ case 1013: \
+ zend_bailout(); \
break; \
- case 22: \
- case 1012: \
- case 3113: \
- case 604: \
- case 1041: \
- case 3114: \
- connection->is_open = 0; \
+ case 22: \
+ case 1012: \
+ case 3113: \
+ case 604: \
+ case 1041: \
+ case 3114: \
+ connection->is_open = 0; \
break; \
- } \
-} \
+ } \
+ } while (0)
#define PHP_OCI_REGISTER_RESOURCE(resource, le_resource) \
- resource->id = ZEND_REGISTER_RESOURCE(NULL, resource, le_resource); \
- zend_list_addref(resource->connection->rsrc_id);
+ do { \
+ resource->id = ZEND_REGISTER_RESOURCE(NULL, resource,
le_resource); \
+ zend_list_addref(resource->connection->rsrc_id); \
+ } while (0)
#define PHP_OCI_ZVAL_TO_CONNECTION(zval, connection) \
ZEND_FETCH_RESOURCE2(connection, php_oci_connection *, &zval, -1, "oci8
connection", le_connection, le_pconnection);
@@ -280,10 +286,12 @@
ZEND_FETCH_RESOURCE(collection, php_oci_collection *, &zval, -1, "oci8
collection", le_collection)
#define PHP_OCI_FETCH_RESOURCE_EX(zval, var, type, name, resource_type)
\
- var = (type) zend_fetch_resource(&zval TSRMLS_CC, -1, name, NULL, 1,
resource_type); \
- if (!var) {
\
- return 1;
\
- }
+ do { \
+ var = (type) zend_fetch_resource(&zval TSRMLS_CC, -1, name,
NULL, 1, resource_type); \
+ if (!var) {
\
+ return 1;
\
+ } \
+ } while (0)
#define PHP_OCI_ZVAL_TO_CONNECTION_EX(zval, connection) \
PHP_OCI_FETCH_RESOURCE_EX(zval, connection, php_oci_connection *, "oci8
connection", le_connection)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
