PHPC-399: Additional zval_used_for_init cleanup

Author: jmikola

src/BSON/Javascript.c

@@ -141,7 +141,11 @@ phongo_create_object_retval php_phongo_javascript_create_object(zend_class_entry
 HashTable *php_phongo_javascript_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_javascript_t *intern;
+#if PHP_VERSION_ID >= 70000
+	zval                     retval;
+#else
 	zval                     retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;

src/BSON/Regex.c

@@ -207,7 +207,11 @@ phongo_create_object_retval php_phongo_regex_create_object(zend_class_entry *cla
 HashTable *php_phongo_regex_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_regex_t *intern;
+#if PHP_VERSION_ID >= 70000
+	zval                retval;
+#else
 	zval                retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;

src/BSON/Timestamp.c

@@ -150,7 +150,11 @@ phongo_create_object_retval php_phongo_timestamp_create_object(zend_class_entry
 HashTable *php_phongo_timestamp_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_timestamp_t *intern;
+#if PHP_VERSION_ID >= 70000
+	zval                    retval;
+#else
 	zval                    retval = zval_used_for_init;
+#endif
 
 
 	*is_temp = 1;

src/BSON/UTCDateTime.c

@@ -182,7 +182,11 @@ phongo_create_object_retval php_phongo_utcdatetime_create_object(zend_class_entr
 HashTable *php_phongo_utcdatetime_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
 	php_phongo_utcdatetime_t *intern;
+#if PHP_VERSION_ID >= 70000
+	zval                      retval;
+#else
 	zval                      retval = zval_used_for_init;
+#endif
 
 	*is_temp = 1;
 	intern = (php_phongo_utcdatetime_t *)zend_object_store_get_object(object TSRMLS_CC);

src/MongoDB/Command.c

@@ -135,9 +135,9 @@ HashTable *php_phongo_command_get_debug_info(zval *object, int *is_temp TSRMLS_D
 {
 	php_phongo_command_t  *intern;
 #if PHP_VERSION_ID >= 70000
-	zval                  retval;
+	zval                   retval;
 #else
-	zval                  retval = zval_used_for_init;
+	zval                   retval = zval_used_for_init;
 #endif
 
 

src/MongoDB/WriteConcern.c

@@ -248,9 +248,9 @@ 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;
+	zval                          retval;
 #else
-	zval                    retval = zval_used_for_init;
+	zval                          retval = zval_used_for_init;
 #endif
 	const mongoc_write_concern_t *write_concern = phongo_write_concern_from_zval(object TSRMLS_CC);
 

src/MongoDB/WriteConcernError.c

@@ -178,9 +178,9 @@ HashTable *php_phongo_writeconcernerror_get_debug_info(zval *object, int *is_tem
 {
 	php_phongo_writeconcernerror_t *intern;
 #if PHP_VERSION_ID >= 70000
-	zval                    retval;
+	zval                            retval;
 #else
-	zval                    retval = zval_used_for_init;
+	zval                            retval = zval_used_for_init;
 #endif
 
 

src/MongoDB/WriteError.c

@@ -200,9 +200,9 @@ HashTable *php_phongo_writeerror_get_debug_info(zval *object, int *is_temp TSRML
 {
 	php_phongo_writeerror_t *intern;
 #if PHP_VERSION_ID >= 70000
-	zval                    retval;
+	zval                     retval;
 #else
-	zval                    retval = zval_used_for_init;
+	zval                     retval = zval_used_for_init;
 #endif