[reference] add foreach callback

chobie · chobie · commit 0543448b496a · 2014-01-12T19:11:15.000+09:00
diff --git a/helper.c b/helper.c
@@ -171,6 +171,9 @@ int php_git2_make_resource(php_git2_t **out, enum php_git2_resource_type type, v
 		case PHP_GIT2_TYPE_REFERENCE:
 			PHP_GIT2_V(result, reference) = (git_reference*)resource;
 			break;
+		case PHP_GIT2_TYPE_REFERENCE_ITERATOR:
+			PHP_GIT2_V(result, reference_iterator) = (git_reference_iterator*)resource;
+			break;
 		case PHP_GIT2_TYPE_CONFIG:
 			PHP_GIT2_V(result, config) = (git_config*)resource;
 			break;
@@ -237,6 +240,8 @@ int php_git2_make_resource(php_git2_t **out, enum php_git2_resource_type type, v
 		case PHP_GIT2_TYPE_DIFF_LINE:
 			PHP_GIT2_V(result, diff_line) = (git_diff_line*)resource;
 			break;
+		default:
+			php_error_docref(NULL TSRMLS_CC, E_ERROR, "passed resource type does not support. probably bug.");
 	}
 
 	result->type = type;
@@ -285,4 +290,27 @@ int php_git2_call_function_v(
 		efree(params);
 	}
 	return 0;
+}
+
+int php_git2_cb_init(php_git2_cb_t **out, zend_fcall_info *fci, zend_fcall_info_cache *fcc, void *payload TSRMLS_DC)
+{
+	php_git2_cb_t *cb;
+
+	cb = (struct php_git2_cb_t*)emalloc(sizeof(php_git2_cb_t));
+	if (cb == NULL) {
+		return 1;
+	}
+
+	cb->payload = payload;
+	cb->fci = fci;
+	cb->fcc = fcc;
+	GIT2_TSRMLS_SET2(cb, TSRMLS_C);
+
+	*out = cb;
+	return 0;
+}
+
+void php_git2_cb_free(php_git2_cb_t *target)
+{
+	efree(target);
 }
diff --git a/helper.h b/helper.h
@@ -47,4 +47,8 @@ int php_git2_make_resource(php_git2_t **out, enum php_git2_resource_type type, v
 int php_git2_call_function_v(
 	zend_fcall_info *fci, zend_fcall_info_cache *fcc TSRMLS_DC, zval **retval_ptr_ptr, zend_uint param_count, ...);
 
+int php_git2_cb_init(php_git2_cb_t **out, zend_fcall_info *fci, zend_fcall_info_cache *fcc, void *payload TSRMLS_DC);
+
+void php_git2_cb_free(php_git2_cb_t *target);
+
 #endif
diff --git a/ng.php b/ng.php
@@ -359,6 +359,7 @@ public function shouldResource(Arg $arg)
                 "git_buf",
                 "git_filter_source",
                 "git_diff_line",
+                "git_reference_iterator",
             );
         }
 
diff --git a/php_git2.c b/php_git2.c
@@ -89,8 +89,6 @@ void static destruct_git2(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 			case PHP_GIT2_TYPE_OBJECT:
 				git_object_free(PHP_GIT2_V(resource, object));
 				break;
-			default:
-				break;
 		}
 	}
 
diff --git a/php_git2.h b/php_git2.h
@@ -86,6 +86,7 @@ enum php_git2_resource_type {
 	PHP_GIT2_TYPE_REVWALK,
 	PHP_GIT2_TYPE_TREEBUILDER,
 	PHP_GIT2_TYPE_REFERENCE,
+	PHP_GIT2_TYPE_REFERENCE_ITERATOR,
 	PHP_GIT2_TYPE_CONFIG,
 	PHP_GIT2_TYPE_OBJECT,
 	PHP_GIT2_TYPE_INDEX,
@@ -121,6 +122,7 @@ typedef struct php_git2_t {
 		git_revwalk *revwalk;
 		git_treebuilder *treebuilder;
 		git_reference *reference;
+		git_reference_iterator *reference_iterator;
 		git_config *config;
 		git_object *object;
 		git_index *index;
diff --git a/php_git2_priv.h b/php_git2_priv.h
@@ -71,6 +71,13 @@ do {\
 
 #define GIT2_OID_HEXSIZE (GIT_OID_HEXSZ+1)
 
+typedef struct php_git2_cb_t {
+	zval *payload;
+	zend_fcall_info *fci;
+	zend_fcall_info_cache *fcc;
+	GIT2_TSRMLS_DECL
+} php_git2_cb_t;
+
 #include "helper.h"
 
 #endif
diff --git a/reference.c b/reference.c
diff --git a/reference.h b/reference.h

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,7 @@ public function shouldResource(Arg $arg)`
`359`	`359`	`"git_buf",`
`360`	`360`	`"git_filter_source",`
`361`	`361`	`"git_diff_line",`
	`362`	`+ "git_reference_iterator",`
`362`	`363`	`);`
`363`	`364`	`}`
`364`	`365`
Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,6 @@ void static destruct_git2(zend_rsrc_list_entry *rsrc TSRMLS_DC)`
`89`	`89`	`case PHP_GIT2_TYPE_OBJECT:`
`90`	`90`	`git_object_free(PHP_GIT2_V(resource, object));`
`91`	`91`	`break;`
`92`		`- default:`
`93`		`- break;`
`94`	`92`	`}`
`95`	`93`	`}`
`96`	`94`