[blob] add git_blob_create_frombuffer test

chobie · chobie · commit bd044396932c · 2014-01-12T15:22:26.000+09:00
diff --git a/blob.c b/blob.c
@@ -12,15 +12,14 @@ PHP_FUNCTION(git_blob_create_frombuffer)
 	int buffer_len;
 	int error;
 	git_oid id;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rs", &repository, &buffer, &buffer_len) == FAILURE) {
 		return;
 	}
 
 	ZEND_FETCH_RESOURCE(git2, php_git2_t*, &repository, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
-
 	error = git_blob_create_frombuffer(&id, PHP_GIT2_V(git2, repository), buffer, buffer_len);
 	if (php_git2_check_error(error, "git_blob_create_frombuffer" TSRMLS_CC)) {
 		RETURN_FALSE
@@ -46,7 +45,7 @@ PHP_FUNCTION(git_blob_create_fromdisk)
 	int path_len;
 	int error;
 	git_oid id;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rs", &repository, &path, &path_len) == FAILURE) {
@@ -74,7 +73,7 @@ PHP_FUNCTION(git_blob_create_fromworkdir)
 	int path_len;
 	int error;
 	git_oid id;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rs", &repository, &path, &path_len) == FAILURE) {
@@ -124,7 +123,7 @@ PHP_FUNCTION(git_blob_id)
 {
 	zval *blob;
 	php_git2_t *git2;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 	const git_oid *id;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
diff --git a/commit.c b/commit.c
@@ -121,7 +121,7 @@ PHP_FUNCTION(git_commit_id)
 {
 	zval *commit;
 	php_git2_t *_commit;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 	const git_oid *id;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -293,7 +293,7 @@ PHP_FUNCTION(git_commit_tree_id)
 {
 	zval *commit;
 	php_git2_t *_commit;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 	const git_oid *id;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -362,7 +362,7 @@ PHP_FUNCTION(git_commit_parent_id)
 	php_git2_t *_commit;
 	long n;
 	git_oid *oid;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rl", &commit, &n) == FAILURE) {
@@ -417,7 +417,7 @@ PHP_FUNCTION(git_commit_create)
 	int update_ref_len, message_encoding_len, message_len, parent_count = 0, error = 0, i;
 	php_git2_t *_repo, *_author, *_committer, *_tree;
 	git_signature __author, __committer;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 	git_oid oid;
 	const git_commit **__parents = NULL;
 	HashPosition pos;
diff --git a/filter.c b/filter.c
@@ -308,7 +308,7 @@ PHP_FUNCTION(git_filter_source_id)
 	const git_oid  *result = NULL;
 	zval *src = NULL;
 	php_git2_t *_src = NULL;
-	char __result[41] = {0};
+	char __result[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"r", &src) == FAILURE) {
diff --git a/index.c b/index.c
@@ -35,7 +35,7 @@ static int php_git2_array_to_index_entry(git_index_entry *entry, zval *array TSR
 static void php_git2_index_entry_to_array(const git_index_entry *entry, zval **result TSRMLS_DC)
 {
 	zval *tmp, *ctime, *mtime;
-	char buf[41] = {0};
+	char buf[GIT2_OID_HEXSIZE] = {0};
 
 	MAKE_STD_ZVAL(tmp);
 	MAKE_STD_ZVAL(ctime);
@@ -283,7 +283,7 @@ PHP_FUNCTION(git_index_write_tree)
 	php_git2_t *_index;
 	int error = 0;
 	git_oid id;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"r", &index) == FAILURE) {
@@ -307,7 +307,7 @@ PHP_FUNCTION(git_index_write_tree_to)
 	zval *repo;
 	php_git2_t *_repo;
 	git_oid id;
-	char out[41]= {0};
+	char out[GIT2_OID_HEXSIZE]= {0};
 	int error = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
diff --git a/merge.c b/merge.c
@@ -16,7 +16,7 @@ PHP_FUNCTION(git_merge_base)
 	int two_len = 0;
 	git_oid __two;
 	int error = 0;
-	char result[41] = {0};
+	char result[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rss", &repo, &one, &one_len, &two, &two_len) == FAILURE) {
@@ -316,7 +316,7 @@ PHP_FUNCTION(git_merge_result_fastforward_oid)
 	zval *merge_result = NULL;
 	php_git2_t *_merge_result = NULL;
 	int error = 0;
-	char buffer[41] = {0};
+	char buffer[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"r", &merge_result) == FAILURE) {
diff --git a/ng.php b/ng.php
@@ -519,7 +519,7 @@ public function generateDeclarations(Printer $printer, Func $f)
             $printer->put("`type` error = 0;\n", "type", $f->getReturnType());
         }
         if (preg_match("/git_oid/", $f->getReturnType())) {
-            $printer->put("char __result[41] = {0};\n");
+            $printer->put("char __result[GIT2_OID_HEXSIZE] = {0};\n");
         }
         if (preg_match("/_owner$/", $f->getName())) {
             $printer->put("php_git2_t *__result = NULL;\n");
diff --git a/object.c b/object.c
@@ -98,7 +98,7 @@ PHP_FUNCTION(git_object_id)
 	zval *obj;
 	php_git2_t *_obj;
 	const git_oid *id;
-	char buf[41] = {0};
+	char buf[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"r", &obj) == FAILURE) {
diff --git a/php_git2.h b/php_git2.h
@@ -48,9 +48,10 @@
 #include "limits.h"
 
 #include "git2.h"
-#include "git2/sys/filter.h"
+#include "git2/odb.h"
 #include "git2/odb_backend.h"
 #include "git2/trace.h"
+#include "git2/sys/filter.h"
 
 #include "date/php_date.h"
 
diff --git a/php_git2_priv.h b/php_git2_priv.h
@@ -57,6 +57,8 @@ do {\
 	val->mutable = 0;\
 } while (0);\
 
+#define GIT2_OID_HEXSIZE (GIT_OID_HEXSZ+1)
+
 #include "helper.h"
 
 #endif
diff --git a/reference.c b/reference.c
@@ -42,7 +42,7 @@ PHP_FUNCTION(git_reference_name_to_id)
 	char *name = {0};
 	int name_len;
 	git_oid id;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 	int error;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -196,7 +196,7 @@ PHP_FUNCTION(git_reference_target_peel)
 	zval *ref;
 	php_git2_t *_ref;
 	git_oid *oid;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"r", &ref) == FAILURE) {
diff --git a/repository.c b/repository.c
@@ -625,7 +625,7 @@ PHP_FUNCTION(git_repository_hashfile)
 	int as_path_len;
 	git_oid oid;
 	int error = 0;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rsrs", &repo, &path, &path_len, &type, &as_path, &as_path_len) == FAILURE) {
diff --git a/revwalk.c b/revwalk.c
@@ -238,7 +238,7 @@ PHP_FUNCTION(git_revwalk_next)
 	zval *walk;
 	php_git2_t *_walk;
 	git_oid id = {0};
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 	int error = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
diff --git a/tag.c b/tag.c
@@ -100,7 +100,7 @@ PHP_FUNCTION(git_tag_id)
 	const git_oid  *result = NULL;
 	zval *tag = NULL;
 	php_git2_t *_tag = NULL;
-	char __result[41] = {0};
+	char __result[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"r", &tag) == FAILURE) {
@@ -175,7 +175,7 @@ PHP_FUNCTION(git_tag_target_id)
 	const git_oid  *result = NULL;
 	zval *tag = NULL;
 	php_git2_t *_tag = NULL;
-	char __result[41] = {0};
+	char __result[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"r", &tag) == FAILURE) {
@@ -284,7 +284,7 @@ PHP_FUNCTION(git_tag_create)
 	int message_len = 0;
 	long force = 0;
 	int error = 0;
-	char buffer[41] = {0};
+	char buffer[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rsrasl", &repo, &tag_name, &tag_name_len, &target, &tagger, &message, &message_len, &force) == FAILURE) {
@@ -320,7 +320,7 @@ PHP_FUNCTION(git_tag_annotation_create)
 	char *message = NULL;
 	int message_len = 0;
 	int error = 0;
-	char buffer[41] = {0};
+	char buffer[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rsras", &repo, &tag_name, &tag_name_len, &target, &tagger, &message, &message_len) == FAILURE) {
@@ -351,7 +351,7 @@ PHP_FUNCTION(git_tag_create_frombuffer)
 	int buffer_len = 0;
 	long force = 0;
 	int error = 0;
-	char oid[41] = {0};
+	char oid[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rsl", &repo, &buffer, &buffer_len, &force) == FAILURE) {
@@ -383,7 +383,7 @@ PHP_FUNCTION(git_tag_create_lightweight)
 	php_git2_t *_target = NULL;
 	long force = 0;
 	int error = 0;
-	char oid[41] = {0};
+	char oid[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rsrl", &repo, &tag_name, &tag_name_len, &target, &force) == FAILURE) {
diff --git a/tests/blob/git_blob_create_frombuffer.phpt b/tests/blob/git_blob_create_frombuffer.phpt
@@ -4,7 +4,12 @@ Check for git_blob_create_frombuffer presence
 <?php if (!extension_loaded("git2")) print "skip"; ?>
 --FILE--
 <?php
-echo "NOT YET";
---XFAIL--
-NOT YET
+$repositroy = git_repository_init("/tmp/a");
+echo git_blob_create_frombuffer($repositroy, "Helo World");
+
+// TODO(chobie): we can't detect git_repository_new has correct odb now. fix this.
+//$repositroy = git_repository_new();
+//git_blob_create_frombuffer($repositroy, "Helo World");
+
 --EXPECT--
+826a9a65bc435bb1f1812433fa8fd5fa2ee9d678
diff --git a/tree.c b/tree.c
@@ -127,7 +127,7 @@ PHP_FUNCTION(git_tree_entry_id)
 {
 	zval *tree_entry;
 	php_git2_t *git2;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	const git_oid *id;
 
@@ -333,7 +333,7 @@ PHP_FUNCTION(git_tree_id)
 {
 	zval *tree;
 	php_git2_t *git2;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	const git_oid *id;
 
diff --git a/treebuilder.c b/treebuilder.c
@@ -210,7 +210,7 @@ PHP_FUNCTION(git_treebuilder_write)
 	php_git2_t *_bld;
 	git_oid id;
 	int error = 0;
-	char out[41] = {0};
+	char out[GIT2_OID_HEXSIZE] = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rr", &repo, &bld) == FAILURE) {

Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ public function generateDeclarations(Printer $printer, Func $f)`
`519`	`519`	$printer->put("`type` error = 0;\n", "type", $f->getReturnType());
`520`	`520`	`}`
`521`	`521`	`if (preg_match("/git_oid/", $f->getReturnType())) {`
`522`		`- $printer->put("char __result[41] = {0};\n");`
	`522`	`+ $printer->put("char __result[GIT2_OID_HEXSIZE] = {0};\n");`
`523`	`523`	`}`
`524`	`524`	`if (preg_match("/_owner$/", $f->getName())) {`
`525`	`525`	`$printer->put("php_git2_t *__result = NULL;\n");`