PHPC-399: zval_used_for_init is no longer needed (or defined)

bjori · derickr · commit e5a42179b0d2 · 2015-12-16T10:21:33.000Z
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -172,7 +172,11 @@ phongo_create_object_retval php_phongo_binary_create_object(zend_class_entry *cl
 HashTable *php_phongo_binary_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_binary_t *intern;
+#if PHP_VERSION_ID <= 70000
+	zval                 retval;
+#else
 	zval                 retval = zval_used_for_init;
+#endif
 
 	intern = Z_BINARY_OBJ_P(object);
 	*is_temp = 1;
diff --git a/src/BSON/ObjectID.c b/src/BSON/ObjectID.c
@@ -173,7 +173,11 @@ static int php_phongo_objectid_compare_objects(zval *o1, zval *o2 TSRMLS_DC) /*
 HashTable *php_phongo_objectid_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_objectid_t    *intern;
+#if PHP_VERSION_ID <= 70000
+	zval                      retval;
+#else
 	zval                      retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;
diff --git a/src/MongoDB/BulkWrite.c b/src/MongoDB/BulkWrite.c
@@ -311,8 +311,12 @@ phongo_create_object_retval php_phongo_bulkwrite_create_object(zend_class_entry
 
 HashTable *php_phongo_bulkwrite_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
-	zval                     retval = zval_used_for_init;
-	php_phongo_bulkwrite_t *intern = NULL;
+#if PHP_VERSION_ID <= 70000
+	zval                      retval;
+#else
+	zval                      retval = zval_used_for_init;
+#endif
+	php_phongo_bulkwrite_t   *intern = NULL;
 
 
 	*is_temp = 1;
diff --git a/src/MongoDB/Command.c b/src/MongoDB/Command.c
@@ -134,7 +134,11 @@ phongo_create_object_retval php_phongo_command_create_object(zend_class_entry *c
 HashTable *php_phongo_command_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_command_t  *intern;
-	zval                   retval = zval_used_for_init;
+#if PHP_VERSION_ID <= 70000
+	zval                  retval;
+#else
+	zval                  retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;
diff --git a/src/MongoDB/Cursor.c b/src/MongoDB/Cursor.c
@@ -254,7 +254,11 @@ phongo_create_object_retval php_phongo_cursor_create_object(zend_class_entry *cl
 HashTable *php_phongo_cursor_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_cursor_t    *intern;
-	zval                           retval = zval_used_for_init;
+#if PHP_VERSION_ID <= 70000
+	zval                    retval;
+#else
+	zval                    retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;
diff --git a/src/MongoDB/CursorId.c b/src/MongoDB/CursorId.c
@@ -120,7 +120,11 @@ phongo_create_object_retval php_phongo_cursorid_create_object(zend_class_entry *
 HashTable *php_phongo_cursorid_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_cursorid_t  *intern;
+#if PHP_VERSION_ID <= 70000
+	zval                    retval;
+#else
 	zval                    retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;
diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c
@@ -435,7 +435,11 @@ bool phongo_add_server_debug(void *item, void *ctx) /* {{{ */
 HashTable *php_phongo_manager_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_manager_t  *intern;
+#if PHP_VERSION_ID <= 70000
+	zval                   retval;
+#else
 	zval                   retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;
diff --git a/src/MongoDB/Query.c b/src/MongoDB/Query.c
@@ -171,7 +171,11 @@ phongo_create_object_retval php_phongo_query_create_object(zend_class_entry *cla
 HashTable *php_phongo_query_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_query_t    *intern;
+#if PHP_VERSION_ID <= 70000
+	zval                   retval;
+#else
 	zval                   retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -208,7 +208,11 @@ phongo_create_object_retval php_phongo_readpreference_create_object(zend_class_e
 
 HashTable *php_phongo_readpreference_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
-	zval                 retval = zval_used_for_init;
+#if PHP_VERSION_ID <= 70000
+	zval                       retval;
+#else
+	zval                       retval = zval_used_for_init;
+#endif
 	const mongoc_read_prefs_t *read_prefs = phongo_read_preference_from_zval(object TSRMLS_CC);
 
 
diff --git a/src/MongoDB/Server.c b/src/MongoDB/Server.c
@@ -545,7 +545,11 @@ phongo_create_object_retval php_phongo_server_create_object(zend_class_entry *cl
 HashTable *php_phongo_server_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_server_t         *intern = NULL;
+#if PHP_VERSION_ID <= 70000
+	zval                         retval;
+#else
 	zval                         retval = zval_used_for_init;
+#endif
 	mongoc_server_description_t *sd;
 	bson_error_t                 error;
 
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -247,7 +247,11 @@ phongo_create_object_retval php_phongo_writeconcern_create_object(zend_class_ent
 
 HashTable *php_phongo_writeconcern_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
+#if PHP_VERSION_ID <= 70000
+	zval                    retval;
+#else
 	zval                    retval = zval_used_for_init;
+#endif
 	const mongoc_write_concern_t *write_concern = phongo_write_concern_from_zval(object TSRMLS_CC);
 
 
diff --git a/src/MongoDB/WriteConcernError.c b/src/MongoDB/WriteConcernError.c
@@ -177,7 +177,11 @@ phongo_create_object_retval php_phongo_writeconcernerror_create_object(zend_clas
 HashTable *php_phongo_writeconcernerror_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_writeconcernerror_t *intern;
+#if PHP_VERSION_ID <= 70000
+	zval                    retval;
+#else
 	zval                    retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;
diff --git a/src/MongoDB/WriteError.c b/src/MongoDB/WriteError.c
@@ -199,7 +199,11 @@ phongo_create_object_retval php_phongo_writeerror_create_object(zend_class_entry
 HashTable *php_phongo_writeerror_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_writeerror_t *intern;
+#if PHP_VERSION_ID <= 70000
+	zval                    retval;
+#else
 	zval                    retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;
diff --git a/src/MongoDB/WriteResult.c b/src/MongoDB/WriteResult.c
@@ -461,7 +461,11 @@ phongo_create_object_retval php_phongo_writeresult_create_object(zend_class_entr
 HashTable *php_phongo_writeresult_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_writeresult_t *intern;
+#if PHP_VERSION_ID <= 70000
+	zval                      retval;
+#else
 	zval                      retval = zval_used_for_init;
+#endif
 	php_phongo_bson_state     state = PHONGO_BSON_STATE_INITIALIZER;
 	bson_iter_t iter;
 
