@@ -6,7 +6,7 @@
  */
 PHP_FUNCTION(git_attr_value)
 {
-	git_attr_t *result = NULL;
+	git_attr_t result;
 	char *attr = NULL;
 	int attr_len = 0;
 
 
@@ -496,7 +496,7 @@ PHP_FUNCTION(git_filter_source_id)
  */
 PHP_FUNCTION(git_filter_source_mode)
 {
-	git_filter_mode_t *result = NULL;
+	git_filter_mode_t result;
 	zval *src = NULL;
 	php_git2_t *_src = NULL;
 
@@ -603,4 +603,4 @@ PHP_FUNCTION(git_filter_new)
 		RETURN_FALSE;
 	}
 	ZVAL_RESOURCE(return_value, GIT2_RVAL_P(result));
-}
+}
@@ -112,7 +112,7 @@ PHP_FUNCTION(git_object_id)
  */
 PHP_FUNCTION(git_object_type)
 {
-	git_otype *result = NULL;
+	git_otype result;
 	zval *obj = NULL;
 	php_git2_t *_obj = NULL;
 
 
@@ -628,7 +628,7 @@ PHP_FUNCTION(git_odb_object_size)
  */
 PHP_FUNCTION(git_odb_object_type)
 {
-	git_otype *result = NULL;
+	git_otype result;
 	zval *object = NULL;
 	php_git2_t *_object = NULL;
 
@@ -1106,4 +1106,4 @@ PHP_FUNCTION(git_odb_backend_new)
 	}
 
 	ZVAL_RESOURCE(return_value, GIT2_RVAL_P(result));
-}
+}
@@ -259,7 +259,7 @@ PHP_FUNCTION(git_reference_symbolic_target)
  */
 PHP_FUNCTION(git_reference_type)
 {
-	git_ref_t *result = NULL;
+	git_ref_t result;
 	zval *ref = NULL;
 	php_git2_t *_ref = NULL;
 
 
@@ -82,7 +82,7 @@ PHP_FUNCTION(git_refspec_force)
  */
 PHP_FUNCTION(git_refspec_direction)
 {
-	git_direction *result = NULL;
+	git_direction result;
 	zval *spec = NULL;
 	php_git2_t *_spec = NULL;
 
 
@@ -880,7 +880,7 @@ PHP_FUNCTION(git_remote_stats)
  */
 PHP_FUNCTION(git_remote_autotag)
 {
-	git_remote_autotag_option_t *result = NULL;
+	git_remote_autotag_option_t result;
 	zval *remote = NULL;
 	php_git2_t *_remote = NULL;
 
@@ -908,7 +908,7 @@ PHP_FUNCTION(git_remote_set_autotag)
 	}
 
 	ZEND_FETCH_RESOURCE(_remote, php_git2_t*, &remote, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
-	git_remote_set_autotag(PHP_GIT2_V(_remote, remote), value);
+	git_remote_set_autotag(PHP_GIT2_V(_remote, remote), Z_LVAL_P(value));
 }
 /* }}} */
 
 
@@ -328,7 +328,7 @@ PHP_FUNCTION(git_submodule_wd_id)
  */
 PHP_FUNCTION(git_submodule_ignore)
 {
-	git_submodule_ignore_t *result = NULL;
+	git_submodule_ignore_t result;
 	zval *submodule = NULL;
 	php_git2_t *_submodule = NULL;
 
@@ -347,7 +347,7 @@ PHP_FUNCTION(git_submodule_ignore)
  */
 PHP_FUNCTION(git_submodule_set_ignore)
 {
-	git_submodule_ignore_t *result = NULL;
+	git_submodule_ignore_t result;
 	zval *submodule = NULL;
 	php_git2_t *_submodule = NULL;
 	long ignore = 0;
@@ -367,7 +367,7 @@ PHP_FUNCTION(git_submodule_set_ignore)
  */
 PHP_FUNCTION(git_submodule_update)
 {
-	git_submodule_update_t *result = NULL;
+	git_submodule_update_t result;
 	zval *submodule = NULL;
 	php_git2_t *_submodule = NULL;
 
@@ -386,7 +386,7 @@ PHP_FUNCTION(git_submodule_update)
  */
 PHP_FUNCTION(git_submodule_set_update)
 {
-	git_submodule_update_t *result = NULL;
+	git_submodule_update_t result;
 	zval *submodule = NULL;
 	php_git2_t *_submodule = NULL;
 	long update = 0;
 
@@ -215,7 +215,7 @@ PHP_FUNCTION(git_tag_target_id)
  */
 PHP_FUNCTION(git_tag_target_type)
 {
-	git_otype *result = NULL;
+	git_otype result;
 	zval *tag = NULL;
 	php_git2_t *_tag = NULL;
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*/`
`7`	`7`	`PHP_FUNCTION(git_attr_value)`
`8`	`8`	`{`
`9`		`- git_attr_t *result = NULL;`
	`9`	`+ git_attr_t result;`
`10`	`10`	`char *attr = NULL;`
`11`	`11`	`int attr_len = 0;`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ PHP_FUNCTION(git_filter_source_id)`
`496`	`496`	`*/`
`497`	`497`	`PHP_FUNCTION(git_filter_source_mode)`
`498`	`498`	`{`
`499`		`- git_filter_mode_t *result = NULL;`
	`499`	`+ git_filter_mode_t result;`
`500`	`500`	`zval *src = NULL;`
`501`	`501`	`php_git2_t *_src = NULL;`
`502`	`502`
`@@ -603,4 +603,4 @@ PHP_FUNCTION(git_filter_new)`
`603`	`603`	`RETURN_FALSE;`
`604`	`604`	`}`
`605`	`605`	`ZVAL_RESOURCE(return_value, GIT2_RVAL_P(result));`
`606`		`-}`
	`606`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ PHP_FUNCTION(git_object_id)`
`112`	`112`	`*/`
`113`	`113`	`PHP_FUNCTION(git_object_type)`
`114`	`114`	`{`
`115`		`- git_otype *result = NULL;`
	`115`	`+ git_otype result;`
`116`	`116`	`zval *obj = NULL;`
`117`	`117`	`php_git2_t *_obj = NULL;`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,7 @@ PHP_FUNCTION(git_odb_object_size)`
`628`	`628`	`*/`
`629`	`629`	`PHP_FUNCTION(git_odb_object_type)`
`630`	`630`	`{`
`631`		`- git_otype *result = NULL;`
	`631`	`+ git_otype result;`
`632`	`632`	`zval *object = NULL;`
`633`	`633`	`php_git2_t *_object = NULL;`
`634`	`634`
`@@ -1106,4 +1106,4 @@ PHP_FUNCTION(git_odb_backend_new)`
`1106`	`1106`	`}`
`1107`	`1107`
`1108`	`1108`	`ZVAL_RESOURCE(return_value, GIT2_RVAL_P(result));`
`1109`		`-}`
	`1109`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ PHP_FUNCTION(git_reference_symbolic_target)`
`259`	`259`	`*/`
`260`	`260`	`PHP_FUNCTION(git_reference_type)`
`261`	`261`	`{`
`262`		`- git_ref_t *result = NULL;`
	`262`	`+ git_ref_t result;`
`263`	`263`	`zval *ref = NULL;`
`264`	`264`	`php_git2_t *_ref = NULL;`
`265`	`265`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ PHP_FUNCTION(git_refspec_force)`
`82`	`82`	`*/`
`83`	`83`	`PHP_FUNCTION(git_refspec_direction)`
`84`	`84`	`{`
`85`		`- git_direction *result = NULL;`
	`85`	`+ git_direction result;`
`86`	`86`	`zval *spec = NULL;`
`87`	`87`	`php_git2_t *_spec = NULL;`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -880,7 +880,7 @@ PHP_FUNCTION(git_remote_stats)`
`880`	`880`	`*/`
`881`	`881`	`PHP_FUNCTION(git_remote_autotag)`
`882`	`882`	`{`
`883`		`- git_remote_autotag_option_t *result = NULL;`
	`883`	`+ git_remote_autotag_option_t result;`
`884`	`884`	`zval *remote = NULL;`
`885`	`885`	`php_git2_t *_remote = NULL;`
`886`	`886`
`@@ -908,7 +908,7 @@ PHP_FUNCTION(git_remote_set_autotag)`
`908`	`908`	`}`
`909`	`909`
`910`	`910`	`ZEND_FETCH_RESOURCE(_remote, php_git2_t*, &remote, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);`
`911`		`- git_remote_set_autotag(PHP_GIT2_V(_remote, remote), value);`
	`911`	`+ git_remote_set_autotag(PHP_GIT2_V(_remote, remote), Z_LVAL_P(value));`
`912`	`912`	`}`
`913`	`913`	`/* }}} */`
`914`	`914`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ PHP_FUNCTION(git_tag_target_id)`
`215`	`215`	`*/`
`216`	`216`	`PHP_FUNCTION(git_tag_target_type)`
`217`	`217`	`{`
`218`		`- git_otype *result = NULL;`
	`218`	`+ git_otype result;`
`219`	`219`	`zval *tag = NULL;`
`220`	`220`	`php_git2_t *_tag = NULL;`
`221`	`221`