removed use of _PP spawn return_value, added Git2\Tree::entry_bypath()

MagicalTux · MagicalTux · commit 0f558008bac4 · 2016-08-19T11:53:58.000+09:00
diff --git a/git2_blob.c b/git2_blob.c
@@ -109,11 +109,11 @@ static PHP_METHOD(Blob, rawcontent) {
 	RETURN_STRINGL((const char*)res, len);
 }
 
-void git2_blob_spawn(zval **return_value, git_blob *blob TSRMLS_DC) {
+void git2_blob_spawn(zval *return_value, git_blob *blob TSRMLS_DC) {
 	git2_blob_object_t *intern;
 
-	object_init_ex(*return_value, php_git2_blob_ce);
-	intern = (git2_blob_object_t*)Z_OBJ_P(*return_value);
+	object_init_ex(return_value, php_git2_blob_ce);
+	intern = (git2_blob_object_t*)Z_OBJ_P(return_value);
 	intern->blob = blob;
 }
 
diff --git a/git2_blob.h b/git2_blob.h
@@ -3,6 +3,6 @@
 
 void git2_blob_init(TSRMLS_DC);
 
-void git2_blob_spawn(zval **return_value, git_blob *blob TSRMLS_DC);
+void git2_blob_spawn(zval *return_value, git_blob *blob TSRMLS_DC);
 
 #endif /* GIT2_BLOB_H */
diff --git a/git2_commit.c b/git2_commit.c
@@ -148,14 +148,14 @@ static PHP_METHOD(Commit, tree) {
 		return;
 	}
 
-	git2_tree_spawn(&return_value, out);
+	git2_tree_spawn(return_value, out);
 }
 
-void git2_commit_spawn(zval **return_value, git_commit *commit TSRMLS_DC) {
+void git2_commit_spawn(zval *return_value, git_commit *commit TSRMLS_DC) {
 	git2_commit_object_t *intern;
 
-	object_init_ex(*return_value, php_git2_commit_ce);
-	intern = (git2_commit_object_t*)Z_OBJ_P(*return_value);
+	object_init_ex(return_value, php_git2_commit_ce);
+	intern = (git2_commit_object_t*)Z_OBJ_P(return_value);
 	intern->commit = commit;
 }
 
diff --git a/git2_commit.h b/git2_commit.h
@@ -2,6 +2,6 @@
 #define GIT2_COMMIT_H
 
 void git2_commit_init(TSRMLS_DC);
-void git2_commit_spawn(zval **return_value, git_commit *commit TSRMLS_DC);
+void git2_commit_spawn(zval *return_value, git_commit *commit TSRMLS_DC);
 
 #endif /* GIT2_COMMIT_H */
diff --git a/git2_config.c b/git2_config.c
@@ -35,7 +35,7 @@ static PHP_METHOD(Config, get_entry) {
 		RETURN_NULL();
 	}
 
-	git2_config_entry_spawn(&return_value, e);
+	git2_config_entry_spawn(return_value, e);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_config_export, 0, 0, 0)
@@ -88,11 +88,11 @@ static PHP_METHOD(Config, set_string) {
 	RETURN_TRUE;
 }
 
-void git2_config_spawn(zval **return_value, git_config *config TSRMLS_DC) {
+void git2_config_spawn(zval *return_value, git_config *config TSRMLS_DC) {
 	git2_config_object_t *intern;
 
-	object_init_ex(*return_value, php_git2_config_ce);
-	intern = (git2_config_object_t*)Z_OBJ_P(*return_value);
+	object_init_ex(return_value, php_git2_config_ce);
+	intern = (git2_config_object_t*)Z_OBJ_P(return_value);
 	intern->config = config;
 }
 
diff --git a/git2_config.h b/git2_config.h
@@ -3,6 +3,6 @@
 
 void git2_config_init(TSRMLS_DC);
 
-void git2_config_spawn(zval **return_value, git_config *config TSRMLS_DC);
+void git2_config_spawn(zval *return_value, git_config *config TSRMLS_DC);
 
 #endif /* GIT2_CONFIG_H */
diff --git a/git2_config_entry.c b/git2_config_entry.c
@@ -29,11 +29,11 @@ typedef struct _git2_config_entry_object {
 GIT2_CONFIG_ENTRY_GET_STRING(name)
 GIT2_CONFIG_ENTRY_GET_STRING(value)
 
-void git2_config_entry_spawn(zval **return_value, git_config_entry *e TSRMLS_DC) {
+void git2_config_entry_spawn(zval *return_value, git_config_entry *e TSRMLS_DC) {
 	git2_config_entry_object_t *intern;
 
-	object_init_ex(*return_value, php_git2_config_entry_ce);
-	intern = (git2_config_entry_object_t*)Z_OBJ_P(*return_value);
+	object_init_ex(return_value, php_git2_config_entry_ce);
+	intern = (git2_config_entry_object_t*)Z_OBJ_P(return_value);
 	intern->e = e;
 }
 
diff --git a/git2_config_entry.h b/git2_config_entry.h
@@ -3,6 +3,6 @@
 
 void git2_config_entry_init(TSRMLS_DC);
 
-void git2_config_entry_spawn(zval **return_value, git_config_entry *e TSRMLS_DC);
+void git2_config_entry_spawn(zval *return_value, git_config_entry *e TSRMLS_DC);
 
 #endif /* GIT2_CONFIG_ENTRY_H */
diff --git a/git2_reference.c b/git2_reference.c
@@ -2,6 +2,8 @@
 #include "git2_exception.h"
 #include "git2_reference.h"
 #include "git2_commit.h"
+#include "git2_tree.h"
+#include "git2_blob.h"
 
 static zend_class_entry *php_git2_reference_ce;
 static zend_object_handlers php_git2_reference_handler;
@@ -68,7 +70,7 @@ static PHP_METHOD(Reference, resolve) {
 		RETURN_FALSE;
 	}
 
-	git2_reference_spawn(&return_value, out TSRMLS_CC);
+	git2_reference_spawn(return_value, out TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reference_peel, 0, 0, 1)
@@ -102,19 +104,25 @@ static PHP_METHOD(Reference, peel) {
 	// TODO find object type, instanciate
 	switch(git_object_type(out)) {
 		case GIT_OBJ_COMMIT:
-			git2_commit_spawn(&return_value, (git_commit*)out TSRMLS_CC);
+			git2_commit_spawn(return_value, (git_commit*)out TSRMLS_CC);
+			return;
+		case GIT_OBJ_TREE:
+			git2_tree_spawn(return_value, (git_tree*)out TSRMLS_CC);
+			return;
+		case GIT_OBJ_BLOB:
+			git2_blob_spawn(return_value, (git_blob*)out TSRMLS_CC);
 			return;
 		default:
 			git2_throw_exception(0 TSRMLS_CC, "Type of object is not implemented");
 			return;
 	}
 }
 
-void git2_reference_spawn(zval **return_value, git_reference *ref TSRMLS_DC) {
+void git2_reference_spawn(zval *return_value, git_reference *ref TSRMLS_DC) {
 	git2_reference_object_t *intern;
 
-	object_init_ex(*return_value, php_git2_reference_ce);
-	intern = (git2_reference_object_t*)Z_OBJ_P(*return_value);
+	object_init_ex(return_value, php_git2_reference_ce);
+	intern = (git2_reference_object_t*)Z_OBJ_P(return_value);
 	intern->ref = ref;
 }
 
diff --git a/git2_reference.h b/git2_reference.h
@@ -3,6 +3,6 @@
 
 void git2_reference_init(TSRMLS_DC);
 
-void git2_reference_spawn(zval **return_value, git_reference *ref TSRMLS_DC);
+void git2_reference_spawn(zval *return_value, git_reference *ref TSRMLS_DC);
 
 #endif /* GIT2_REFERENCE_H */
diff --git a/git2_remote.c b/git2_remote.c
@@ -285,11 +285,11 @@ static PHP_METHOD(Remote, push) {
 	RETURN_FALSE;
 }
 
-void git2_remote_spawn(zval **return_value, git_remote *remote TSRMLS_DC) {
+void git2_remote_spawn(zval *return_value, git_remote *remote TSRMLS_DC) {
 	git2_remote_object_t *intern;
 
-	object_init_ex(*return_value, php_git2_remote_ce);
-	intern = (git2_remote_object_t*)Z_OBJ_P(*return_value);
+	object_init_ex(return_value, php_git2_remote_ce);
+	intern = (git2_remote_object_t*)Z_OBJ_P(return_value);
 	intern->remote = remote;
 }
 
diff --git a/git2_remote.h b/git2_remote.h
@@ -3,6 +3,6 @@
 
 void git2_remote_init(TSRMLS_DC);
 
-void git2_remote_spawn(zval **return_value, git_remote *remote TSRMLS_DC);
+void git2_remote_spawn(zval *return_value, git_remote *remote TSRMLS_DC);
 
 #endif /* GIT2_REMOTE_H */
diff --git a/git2_repository.c b/git2_repository.c
@@ -190,7 +190,7 @@ static PHP_METHOD(Repository, config) {
 		return;
 	}
 
-	git2_config_spawn(&return_value, out TSRMLS_CC);
+	git2_config_spawn(return_value, out TSRMLS_CC);
 }
 
 
@@ -208,7 +208,7 @@ static PHP_METHOD(Repository, head) {
 		RETURN_FALSE;
 	}
 
-	git2_reference_spawn(&return_value, out TSRMLS_CC);
+	git2_reference_spawn(return_value, out TSRMLS_CC);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_repository_set_head, 0, 0, 1)
diff --git a/git2_tree.c b/git2_tree.c
@@ -168,11 +168,35 @@ static PHP_METHOD(Tree, walk) {
 	RETURN_TRUE;
 }
 
-void git2_tree_spawn(zval **return_value, git_tree *tree TSRMLS_DC) {
+ZEND_BEGIN_ARG_INFO_EX(arginfo_tree_entry_bypath, 0, 0, 1)
+	ZEND_ARG_INFO(0, path)
+ZEND_END_ARG_INFO()
+
+static PHP_METHOD(Tree, entry_bypath) {
+	char *path;
+	size_t path_len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path, &path_len) != SUCCESS) {
+		return;
+	}
+	GIT2_TREE_FETCH();
+
+	git_tree_entry *out;
+	int res = git_tree_entry_bypath(&out, intern->tree, path);
+
+	if (res != 0) {
+		git2_throw_last_error();
+		return;
+	}
+
+	git2_tree_entry_spawn(return_value, out TSRMLS_CC);
+}
+
+void git2_tree_spawn(zval *return_value, git_tree *tree TSRMLS_DC) {
 	git2_tree_object_t *intern;
 
-	object_init_ex(*return_value, php_git2_tree_ce);
-	intern = (git2_tree_object_t*)Z_OBJ_P(*return_value);
+	object_init_ex(return_value, php_git2_tree_ce);
+	intern = (git2_tree_object_t*)Z_OBJ_P(return_value);
 	intern->tree = tree;
 }
 
@@ -208,6 +232,7 @@ static zend_function_entry git2_tree_methods[] = {
 	PHP_ME(Tree, id, arginfo_tree_id, ZEND_ACC_PUBLIC)
 	PHP_ME(Tree, entrycount, arginfo_tree_entrycount, ZEND_ACC_PUBLIC)
 	PHP_ME(Tree, walk, arginfo_tree_walk, ZEND_ACC_PUBLIC)
+	PHP_ME(Tree, entry_bypath, arginfo_tree_entry_bypath, ZEND_ACC_PUBLIC)
 /*	PHP_ME(Tree, __construct, arginfo___construct, ZEND_ACC_PUBLIC) */
 	{ NULL, NULL, NULL }
 };
diff --git a/git2_tree.h b/git2_tree.h
@@ -3,6 +3,6 @@
 
 void git2_tree_init(TSRMLS_DC);
 
-void git2_tree_spawn(zval **return_value, git_tree *tree TSRMLS_DC);
+void git2_tree_spawn(zval *return_value, git_tree *tree TSRMLS_DC);
 
 #endif /* GIT2_TREE_H */
diff --git a/git2_tree_entry.c b/git2_tree_entry.c
@@ -96,6 +96,7 @@ static void php_git2_tree_entry_free_object(zend_object *object TSRMLS_DC) {
 
 #define PHP_GIT2_TREE_ENTRY_ME(_x) PHP_ME(Entry, _x, arginfo_tree_entry_##_x, ZEND_ACC_PUBLIC)
 static zend_function_entry git2_tree_entry_methods[] = {
+//	PHP_ME(Entry, bypath, arginfo_tree_entry_bypath, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC);
 	PHP_GIT2_TREE_ENTRY_ME(name)
 	PHP_GIT2_TREE_ENTRY_ME(id)
 	PHP_GIT2_TREE_ENTRY_ME(type)

Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,11 @@ static PHP_METHOD(Blob, rawcontent) {`
`109`	`109`	`RETURN_STRINGL((const char*)res, len);`
`110`	`110`	`}`
`111`	`111`
`112`		`-void git2_blob_spawn(zval *return_value, git_blob blob TSRMLS_DC) {`
	`112`	`+void git2_blob_spawn(zval return_value, git_blob blob TSRMLS_DC) {`
`113`	`113`	`git2_blob_object_t *intern;`
`114`	`114`
`115`		`- object_init_ex(*return_value, php_git2_blob_ce);`
`116`		`- intern = (git2_blob_object_t)Z_OBJ_P(return_value);`
	`115`	`+ object_init_ex(return_value, php_git2_blob_ce);`
	`116`	`+ intern = (git2_blob_object_t*)Z_OBJ_P(return_value);`
`117`	`117`	`intern->blob = blob;`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -148,14 +148,14 @@ static PHP_METHOD(Commit, tree) {`
`148`	`148`	`return;`
`149`	`149`	`}`
`150`	`150`
`151`		`- git2_tree_spawn(&return_value, out);`
	`151`	`+ git2_tree_spawn(return_value, out);`
`152`	`152`	`}`
`153`	`153`
`154`		`-void git2_commit_spawn(zval *return_value, git_commit commit TSRMLS_DC) {`
	`154`	`+void git2_commit_spawn(zval return_value, git_commit commit TSRMLS_DC) {`
`155`	`155`	`git2_commit_object_t *intern;`
`156`	`156`
`157`		`- object_init_ex(*return_value, php_git2_commit_ce);`
`158`		`- intern = (git2_commit_object_t)Z_OBJ_P(return_value);`
	`157`	`+ object_init_ex(return_value, php_git2_commit_ce);`
	`158`	`+ intern = (git2_commit_object_t*)Z_OBJ_P(return_value);`
`159`	`159`	`intern->commit = commit;`
`160`	`160`	`}`
`161`	`161`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static PHP_METHOD(Config, get_entry) {`
`35`	`35`	`RETURN_NULL();`
`36`	`36`	`}`
`37`	`37`
`38`		`- git2_config_entry_spawn(&return_value, e);`
	`38`	`+ git2_config_entry_spawn(return_value, e);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`ZEND_BEGIN_ARG_INFO_EX(arginfo_config_export, 0, 0, 0)`
`@@ -88,11 +88,11 @@ static PHP_METHOD(Config, set_string) {`
`88`	`88`	`RETURN_TRUE;`
`89`	`89`	`}`
`90`	`90`
`91`		`-void git2_config_spawn(zval *return_value, git_config config TSRMLS_DC) {`
	`91`	`+void git2_config_spawn(zval return_value, git_config config TSRMLS_DC) {`
`92`	`92`	`git2_config_object_t *intern;`
`93`	`93`
`94`		`- object_init_ex(*return_value, php_git2_config_ce);`
`95`		`- intern = (git2_config_object_t)Z_OBJ_P(return_value);`
	`94`	`+ object_init_ex(return_value, php_git2_config_ce);`
	`95`	`+ intern = (git2_config_object_t*)Z_OBJ_P(return_value);`
`96`	`96`	`intern->config = config;`
`97`	`97`	`}`
`98`	`98`