Resolve build warnings. Bump ver. Better range check. Fix diffs

cjbj · cjbj · commit 9047b567e346 · 2015-08-19T10:42:53.000+10:00
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
@@ -3121,8 +3121,8 @@ static int php_oci_old_create_session(php_oci_connection *connection, char *dbna
 	ub4 statement_cache_size = 0;
 
 	if (OCI_G(statement_cache_size) > 0) {
-		if (OCI_G(statement_cache_size) > UB4MAXVAL-1)
-			statement_cache_size = (ub4) UB4MAXVAL-1;
+		if (OCI_G(statement_cache_size) > SB4MAXVAL)
+			statement_cache_size = (ub4) SB4MAXVAL;
 		else
 			statement_cache_size = (ub4) OCI_G(statement_cache_size);
 	}
@@ -3316,8 +3316,8 @@ static int php_oci_create_session(php_oci_connection *connection, php_oci_spool
 	ub4 statement_cache_size = 0;
 
 	if (OCI_G(statement_cache_size) > 0) {
-		if (OCI_G(statement_cache_size) > UB4MAXVAL-1)
-			statement_cache_size = (ub4) UB4MAXVAL-1;
+		if (OCI_G(statement_cache_size) > SB4MAXVAL)
+			statement_cache_size = (ub4) SB4MAXVAL;
 		else
 			statement_cache_size = (ub4) OCI_G(statement_cache_size);
 	}
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
@@ -385,7 +385,7 @@ PHP_FUNCTION(oci_lob_eof)
 	
 	PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);
 	
-	if (!php_oci_lob_get_length(descriptor, &lob_length) && lob_length >= 0) {
+	if (!php_oci_lob_get_length(descriptor, &lob_length)) {
 		if (lob_length == descriptor->lob_current_position) {
 			RETURN_TRUE;
 		}
@@ -492,8 +492,7 @@ PHP_FUNCTION(oci_lob_seek)
 				descriptor->lob_current_position = (offset > 0) ? (ub4) offset : 0;
 			break;
 	}	
-	if ((descriptor->lob_current_position < 0) ||
-		(descriptor->lob_current_position > UB4MAXVAL-1)) {
+	if (descriptor->lob_current_position > UB4MAXVAL) {
 		php_error_docref(NULL, E_WARNING, "Invalid offset or LOB position");
 		RETURN_FALSE;
 	}
diff --git a/ext/oci8/oci8_lob.c b/ext/oci8/oci8_lob.c
@@ -416,10 +416,6 @@ int php_oci_lob_write (php_oci_descriptor *descriptor, ub4 offset, char *data, i
 		return 0;
 	}
 	
-	if (offset < 0) {
-		offset = 0;
-	}
-	
 	if (offset > descriptor->lob_current_position) {
 		offset = descriptor->lob_current_position;
 	}
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
@@ -1481,7 +1481,7 @@ php_oci_out_column *php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAME
 	}
 	
 	if (Z_TYPE_P(column_index) == IS_STRING) {
-		column = php_oci_statement_get_column(statement, -1, Z_STRVAL_P(column_index), Z_STRLEN_P(column_index));
+		column = php_oci_statement_get_column(statement, -1, Z_STRVAL_P(column_index), (int) Z_STRLEN_P(column_index));
 		if (!column) {
 			php_error_docref(NULL, E_WARNING, "Invalid column name \"%s\"", Z_STRVAL_P(column_index));
 			return NULL;
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
@@ -15,10 +15,10 @@ in the free Oracle Instant Client available from Oracle.  Oracle's
 standard cross-version connectivity applies.  For example, PHP OCI8
 linked with Instant Client 11.2 can connect to Oracle Database 9.2
 onward.  See Oracle's note "Oracle Client / Server Interoperability
-Support" (ID 207303.1) for details.  PHP OCI8 2.0 can be built with
-PHP 5.2 onward.  Use the older PHP OCI8 1.4.10 when using PHP 4.3.9
-through to PHP 5.1.x, or when only Oracle Database 9.2 client
-libraries are available.
+Support" (ID 207303.1) for details.  PHP OCI8 2.1.0 can be built with
+PHP 7. PHP OCI8 2.0.9 can be built with PHP 5.2 onward.  Use the older
+PHP OCI8 1.4.10 when using PHP 4.3.9 through to PHP 5.1.x, or when
+only Oracle Database 9.2 client libraries are available.
  </description>
  <lead>
   <name>Christopher Jones</name>
@@ -45,20 +45,20 @@ libraries are available.
   <active>no</active>
  </lead>
 
- <date>2014-03-19</date>
+ <date>2015-01-01</date>
  <time>12:00:00</time>
 
   <version>
-   <release>2.0.9</release>
-   <api>2.0.9</api>
+   <release>2.1.0</release>
+   <api>2.1.0</api>
   </version>
   <stability>
    <release>stable</release>
    <api>stable</api>
   </stability>
   <license uri="http://www.php.net/license">PHP</license>
   <notes>
-Fixed oci_field_* reflection: $field can be a column name or index
+    PHP 7 Compatibility. This version is for PHP 7 only.
   </notes>
  <contents>
   <dir name="/">
@@ -460,6 +460,21 @@ Fixed oci_field_* reflection: $field can be a column name or index
  </extsrcrelease>
  <changelog>
 
+<release>
+  <version>
+   <release>2.0.9</release>
+   <api>2.0.9</api>
+  </version>
+  <stability>
+   <release>stable</release>
+   <api>stable</api>
+  </stability>
+  <license uri="http://www.php.net/license">PHP</license>
+  <notes>
+Fixed oci_field_* reflection: $field can be a column name or index
+  </notes>
+</release>
+
 <release>
   <version>
    <release>2.0.8</release>
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
@@ -45,7 +45,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "2.0.9"
+#define PHP_OCI8_VERSION "2.1.0"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry
diff --git a/ext/oci8/tests/imp_res_close.phpt b/ext/oci8/tests/imp_res_close.phpt
@@ -63,7 +63,6 @@ oci8_test_sql_execute($c, $stmtarray);
 --EXPECTF--
 Test 1
   1
-  2
 
-Warning: oci_fetch_array(): %d is not a valid oci8 statement resource in %simp_res_close.php on line %d
+Warning: oci_fetch_array(): supplied resource is not a valid oci8 statement resource in %simp_res_close.php on line %d
 ===DONE===
diff --git a/ext/oci8/tests/imp_res_get_close_2.phpt b/ext/oci8/tests/imp_res_get_close_2.phpt
@@ -56,9 +56,8 @@ while (($s1 = oci_get_implicit_resultset($s))) {
 --EXPECTF--
 Test 1
   1
-  2
 
 Warning: oci_fetch_array(): OCI_INVALID_HANDLE in %s on line %d
 
-Warning: oci_get_implicit_resultset(): %d is not a valid oci8 statement resource in %s on line %d
+Warning: oci_get_implicit_resultset(): supplied resource is not a valid oci8 statement resource in %s on line %d
 ===DONE===

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ PHP_FUNCTION(oci_lob_eof)`
`385`	`385`
`386`	`386`	`PHP_OCI_ZVAL_TO_DESCRIPTOR(tmp, descriptor);`
`387`	`387`
`388`		`- if (!php_oci_lob_get_length(descriptor, &lob_length) && lob_length >= 0) {`
	`388`	`+ if (!php_oci_lob_get_length(descriptor, &lob_length)) {`
`389`	`389`	`if (lob_length == descriptor->lob_current_position) {`
`390`	`390`	`RETURN_TRUE;`
`391`	`391`	`}`
`@@ -492,8 +492,7 @@ PHP_FUNCTION(oci_lob_seek)`
`492`	`492`	`descriptor->lob_current_position = (offset > 0) ? (ub4) offset : 0;`
`493`	`493`	`break;`
`494`	`494`	`}`
`495`		`- if ((descriptor->lob_current_position < 0) \|\|`
`496`		`- (descriptor->lob_current_position > UB4MAXVAL-1)) {`
	`495`	`+ if (descriptor->lob_current_position > UB4MAXVAL) {`
`497`	`496`	`php_error_docref(NULL, E_WARNING, "Invalid offset or LOB position");`
`498`	`497`	`RETURN_FALSE;`
`499`	`498`	`}`
Original file line number	Diff line number	Diff line change
`@@ -416,10 +416,6 @@ int php_oci_lob_write (php_oci_descriptor descriptor, ub4 offset, char data, i`
`416`	`416`	`return 0;`
`417`	`417`	`}`
`418`	`418`
`419`		`- if (offset < 0) {`
`420`		`- offset = 0;`
`421`		`- }`
`422`		`-`
`423`	`419`	`if (offset > descriptor->lob_current_position) {`
`424`	`420`	`offset = descriptor->lob_current_position;`
`425`	`421`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1481,7 +1481,7 @@ php_oci_out_column *php_oci_statement_get_column_helper(INTERNAL_FUNCTION_PARAME`
`1481`	`1481`	`}`
`1482`	`1482`
`1483`	`1483`	`if (Z_TYPE_P(column_index) == IS_STRING) {`
`1484`		`- column = php_oci_statement_get_column(statement, -1, Z_STRVAL_P(column_index), Z_STRLEN_P(column_index));`
	`1484`	`+ column = php_oci_statement_get_column(statement, -1, Z_STRVAL_P(column_index), (int) Z_STRLEN_P(column_index));`
`1485`	`1485`	`if (!column) {`
`1486`	`1486`	`php_error_docref(NULL, E_WARNING, "Invalid column name \"%s\"", Z_STRVAL_P(column_index));`
`1487`	`1487`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ oci8_test_sql_execute($c, $stmtarray);`
`63`	`63`	`--EXPECTF--`
`64`	`64`	`Test 1`
`65`	`65`	`1`
`66`		`- 2`
`67`	`66`
`68`		`-Warning: oci_fetch_array(): %d is not a valid oci8 statement resource in %simp_res_close.php on line %d`
	`67`	`+Warning: oci_fetch_array(): supplied resource is not a valid oci8 statement resource in %simp_res_close.php on line %d`
`69`	`68`	`===DONE===`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,8 @@ while (($s1 = oci_get_implicit_resultset($s))) {`
`56`	`56`	`--EXPECTF--`
`57`	`57`	`Test 1`
`58`	`58`	`1`
`59`		`- 2`
`60`	`59`
`61`	`60`	`Warning: oci_fetch_array(): OCI_INVALID_HANDLE in %s on line %d`
`62`	`61`
`63`		`-Warning: oci_get_implicit_resultset(): %d is not a valid oci8 statement resource in %s on line %d`
	`62`	`+Warning: oci_get_implicit_resultset(): supplied resource is not a valid oci8 statement resource in %s on line %d`
`64`	`63`	`===DONE===`