Correct method vs. function arg number usage in error messages

Author: cjbj

ext/oci8/oci8_interface.c

@@ -40,6 +40,8 @@
 #define OCI_STMT_CALL 10
 #endif
 
+#define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
+
 /* {{{ Register a callback function for Oracle Transparent Application Failover (TAF) */
 PHP_FUNCTION(oci_register_taf_callback)
 {
@@ -258,7 +260,7 @@ PHP_FUNCTION(oci_lob_save)
 	}
 
 	if (offset < 0) {
-		zend_argument_value_error(2, "must be greater than or equal to 0");
+		zend_argument_value_error(ERROR_ARG_POS(3), "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
@@ -350,7 +352,7 @@ PHP_FUNCTION(oci_lob_read)
 	}
 
 	if (length <= 0) {
-		zend_argument_value_error(1, "must be greater than 0");
+		zend_argument_value_error(ERROR_ARG_POS(2), "must be greater than 0");
 		RETURN_THROWS();
 	}
 
@@ -600,7 +602,7 @@ PHP_FUNCTION(oci_lob_truncate)
 	}
 
 	if (trim_length < 0) {
-		zend_argument_value_error(1, "must be greater than or equal to zero");
+		zend_argument_value_error(ERROR_ARG_POS(2), "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
@@ -635,14 +637,14 @@ PHP_FUNCTION(oci_lob_erase)
 	if (offset_is_null) {
 		offset = -1;
 	} else if (offset < 0) {
-		zend_argument_value_error(1, "must be greater than or equal to 0");
+		zend_argument_value_error(ERROR_ARG_POS(2), "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
 	if (length_is_null) {
 		length = -1;
 	} else if (length < 0) {
-		zend_argument_value_error(2, "must be greater than or equal to 0");
+		zend_argument_value_error(ERROR_ARG_POS(3), "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
@@ -833,14 +835,14 @@ PHP_FUNCTION(oci_lob_export)
 	if (start_is_null) {
 		start = -1;
 	} else if (start < 0) {
-		zend_argument_value_error(2, "must be greater than or equal to 0");
+		zend_argument_value_error(ERROR_ARG_POS(3), "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 
 	if (length_is_null) {
 		length = -1;
 	} else if (length < 0) {
-		zend_argument_value_error(3, "must be greater than or equal to 0");
+		zend_argument_value_error(ERROR_ARG_POS(4), "must be greater than or equal to 0");
 		RETURN_THROWS();
 	}
 

ext/oci8/tests/lob_027.phpt

@@ -104,8 +104,8 @@ bool(true)
 string(10) "this is a "
 bool(true)
 string(0) ""
-OCILob::truncate(): Argument #1 ($length) must be greater than or equal to zero
+OCILob::truncate(): Argument #1 ($length) must be greater than or equal to 0
 string(0) ""
 bool(true)
-OCILob::truncate(): Argument #1 ($length) must be greater than or equal to zero
+OCILob::truncate(): Argument #1 ($length) must be greater than or equal to 0
 Done

ext/oci8/tests/lob_042.phpt

@@ -71,5 +71,5 @@ bool(false)
 
 Warning: OCILob::savefile(): Can't open file %s in %s on line %d
 bool(false)
-OCILob::truncate(): Argument #1 ($length) must be greater than or equal to zero
+OCILob::truncate(): Argument #1 ($length) must be greater than or equal to 0
 Done