PHPC-398: zend_parse_parameter 's' expects a char* and size_t now

bjori · derickr · commit 48f04696d64f · 2015-12-16T10:21:33.000Z
diff --git a/phongo_compat.h b/phongo_compat.h
@@ -158,6 +158,7 @@
 # define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRS(_key), _value);
 # define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRS(_key), _value, _len);
 # define phongo_free_object_arg zend_object
+# define phongo_zpp_char_len size_t
 # define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount
 # define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen)
 # define PHONGO_RETURN_STRINGL(s, slen) RETVAL_STRINGL(s, slen)
@@ -179,6 +180,7 @@
 # define Z_PHPDATE_P(object) zend_object_store_get_object(object TSRMLS_CC)
 # define Z_ISUNDEF(x) !x
 # define phongo_free_object_arg void
+# define phongo_zpp_char_len int
 # define ZEND_HASH_APPLY_COUNT(ht) (ht)->nApplyCount
 # define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen, 1)
 # define PHONGO_RETURN_STRINGL(s, slen) RETVAL_STRINGL(s, slen, 1)
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -53,7 +53,7 @@ PHP_METHOD(Binary, __construct)
 	php_phongo_binary_t    *intern;
 	zend_error_handling     error_handling;
 	char                   *data;
-	int                     data_len;
+	phongo_zpp_char_len     data_len;
 	long                    type;
 
 
diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -54,7 +54,7 @@ PHP_METHOD(Javascript, __construct)
 	php_phongo_javascript_t   *intern;
 	zend_error_handling        error_handling;
 	char                      *javascript;
-	int                        javascript_len;
+	phongo_zpp_char_len        javascript_len;
 	zval                      *document = NULL;
 	bson_t                     scope = BSON_INITIALIZER;
 
diff --git a/src/BSON/ObjectID.c b/src/BSON/ObjectID.c
@@ -54,7 +54,7 @@ PHP_METHOD(ObjectID, __construct)
 	php_phongo_objectid_t    *intern;
 	zend_error_handling       error_handling;
 	char                     *id = NULL;
-	int                       id_len;
+	phongo_zpp_char_len       id_len;
 
 
 	zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -53,9 +53,9 @@ PHP_METHOD(Regex, __construct)
 	php_phongo_regex_t       *intern;
 	zend_error_handling       error_handling;
 	char                     *pattern;
-	int                       pattern_len;
+	phongo_zpp_char_len       pattern_len;
 	char                     *flags;
-	int                       flags_len;
+	phongo_zpp_char_len       flags_len;
 
 
 	zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c
@@ -60,9 +60,8 @@ PHP_METHOD(Manager, __construct)
 {
 	php_phongo_manager_t     *intern;
 	zend_error_handling       error_handling;
-	mongoc_uri_t             *uri;
 	char                     *uri_string = NULL;
-	int                       uri_string_len = 0;
+	phongo_zpp_char_len       uri_string_len = 0;
 	zval                     *options = NULL;
 	bson_t                    bson_options = BSON_INITIALIZER;
 	zval                     *driverOptions = NULL;
@@ -92,7 +91,7 @@ PHP_METHOD(Manager, executeCommand)
 {
 	php_phongo_manager_t     *intern;
 	char                     *db;
-	int                       db_len;
+	phongo_zpp_char_len      db_len;
 	zval                     *command;
 	zval                     *readPreference = NULL;
 	php_phongo_command_t     *cmd;
@@ -117,7 +116,7 @@ PHP_METHOD(Manager, executeQuery)
 {
 	php_phongo_manager_t     *intern;
 	char                     *namespace;
-	int                       namespace_len;
+	phongo_zpp_char_len       namespace_len;
 	zval                     *zquery;
 	zval                     *readPreference = NULL;
 	DECLARE_RETURN_VALUE_USED
@@ -140,7 +139,7 @@ PHP_METHOD(Manager, executeBulkWrite)
 {
 	php_phongo_manager_t      *intern;
 	char                      *namespace;
-	int                        namespace_len;
+	phongo_zpp_char_len        namespace_len;
 	zval                      *zbulk;
 	zval                      *zwrite_concern = NULL;
 	php_phongo_bulkwrite_t    *bulk;
diff --git a/src/MongoDB/Server.c b/src/MongoDB/Server.c
@@ -64,7 +64,7 @@ PHP_METHOD(Server, executeCommand)
 {
 	php_phongo_server_t      *intern;
 	char                     *db;
-	int                       db_len;
+	phongo_zpp_char_len       db_len;
 	zval                     *command;
 	zval                     *readPreference = NULL;
 	php_phongo_command_t     *cmd;
@@ -89,7 +89,7 @@ PHP_METHOD(Server, executeQuery)
 {
 	php_phongo_server_t      *intern;
 	char                     *namespace;
-	int                       namespace_len;
+	phongo_zpp_char_len       namespace_len;
 	zval                     *zquery;
 	zval                     *readPreference = NULL;
 	DECLARE_RETURN_VALUE_USED
@@ -112,7 +112,7 @@ PHP_METHOD(Server, executeBulkWrite)
 {
 	php_phongo_server_t      *intern;
 	char                     *namespace;
-	int                       namespace_len;
+	phongo_zpp_char_len       namespace_len;
 	zval                     *zbulk;
 	zval                     *zwrite_concern = NULL;
 	php_phongo_bulkwrite_t   *bulk;
diff --git a/src/bson.c b/src/bson.c
@@ -1165,7 +1165,7 @@ void php_phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *ma
 PHP_FUNCTION(toPHP)
 {
 	char                  *data;
-	int                    data_len;
+	phongo_zpp_char_len    data_len;
 	zval                  *typemap = NULL;
 	php_phongo_bson_state  state = PHONGO_BSON_STATE_INITIALIZER;
 
@@ -1193,11 +1193,11 @@ PHP_FUNCTION(toPHP)
    Returns the JSON representation of a BSON value */
 PHP_FUNCTION(toJSON)
 {
-	      char          *data;
-	      int            data_len;
-	const bson_t        *b;
-	      bool           eof = false;
-	      bson_reader_t *reader;
+	      char                *data;
+	      phongo_zpp_char_len  data_len;
+	const bson_t              *b;
+	      bool                 eof = false;
+	      bson_reader_t       *reader;
 
 	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
 
@@ -1230,10 +1230,10 @@ PHP_FUNCTION(toJSON)
    Returns the BSON representation of a JSON value */
 PHP_FUNCTION(fromJSON)
 {
-	char          *data;
-	int            data_len;
-	bson_t         b = BSON_INITIALIZER;
-	bson_error_t   error;
+	char                *data;
+	phongo_zpp_char_len  data_len;
+	bson_t               b = BSON_INITIALIZER;
+	bson_error_t         error;
 
 	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
 
