Commit:    af14da5714cbcd9c12f140bbb622f10aa0b227a8
Author:    Christopher Jones <s...@php.net>         Thu, 18 Oct 2012 17:53:00 
-0700
Parents:   79a048f76f767b071f49b79e4b2c224986e849a2
Branches:  PHP-5.3 PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=af14da5714cbcd9c12f140bbb622f10aa0b227a8

Log:
Fixed bug #63307 (Unused variable in oci8.c)

An output section for oci_internal_debug() was setting but not using a variable

Bugs:
https://bugs.php.net/63307

Changed paths:
  M  ext/oci8/oci8.c
  M  ext/oci8/package.xml


Diff:
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index bf2eaf5..e2241cf 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -3197,7 +3197,7 @@ static int php_oci_create_session(php_oci_connection 
*connection, php_oci_spool
                PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrGet, ((dvoid 
*)actual_spool->poolh, OCI_HTYPE_SPOOL, (dvoid *)&numopen, (ub4 *)0, 
OCI_ATTR_SPOOL_OPEN_COUNT, OCI_G(err)));
                PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrGet, ((dvoid 
*)actual_spool->poolh, OCI_HTYPE_SPOOL, (dvoid *)&numbusy, (ub4 *)0, 
OCI_ATTR_SPOOL_BUSY_COUNT, OCI_G(err)));
                numfree = numopen - numbusy;    /* number of free connections 
in the pool */
-               php_printf ("OCI8 DEBUG L1: (numopen=%d)(numbusy=%d) at (%s:%d) 
\n", numopen, numbusy, __FILE__, __LINE__);
+               php_printf ("OCI8 DEBUG L1: 
(numopen=%d)(numbusy=%d)(numfree=%d) at (%s:%d) \n", numopen, numbusy, numfree, 
__FILE__, __LINE__);
        } /* }}} */
 
                /* Ping loop: Ping and loop till we get a good connection. When 
a database instance goes
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 9235f14..63ece6f 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -46,8 +46,9 @@ http://pear.php.net/dtd/package-2.0.xsd";>
  </stability>
  <license uri="http://www.php.net/license";>PHP</license>
  <notes>
-   Fixed bug #60901 (Improve "tail" syntax for AIX installation)
+   Fixed bug #63307 (Unused variable in oci8.c)
    Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
+   Fixed bug #60901 (Improve "tail" syntax for AIX installation)
  </notes>
  <contents>
   <dir name="/">


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to