[checkout, ignore] update code base

Author: chobie

checkout.c

@@ -6,11 +6,9 @@
  */
 PHP_FUNCTION(git_checkout_head)
 {
-	int result = 0;
-	zval *repo = NULL;
+	zval *opts = NULL, *repo = NULL;
 	php_git2_t *_repo = NULL;
-	zval *opts = NULL;
-	int error = 0, shoud_free = 0;
+	int result = 0, error = 0, shoud_free = 0;
 	git_checkout_opts *options;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -41,15 +39,10 @@ PHP_FUNCTION(git_checkout_head)
  */
 PHP_FUNCTION(git_checkout_index)
 {
-	int result = 0;
-	zval *repo = NULL;
-	php_git2_t *_repo = NULL;
-	zval *index = NULL;
-	php_git2_t *_index = NULL;
-	zval *opts = NULL;
-	int error = 0;
+	int result = 0, error = 0;
+	zval *repo = NULL, *index = NULL, *opts = NULL;
+	php_git2_t *_repo = NULL, *_index = NULL;
 
-	/* TODO(chobie): generate converter */
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rra", &repo, &index, &opts) == FAILURE) {
 		return;
@@ -62,22 +55,18 @@ PHP_FUNCTION(git_checkout_index)
 }
 /* }}} */
 
+
 /* {{{ proto long git_checkout_tree(resource $repo, resource $treeish,  $opts)
  */
 PHP_FUNCTION(git_checkout_tree)
 {
-	int result = 0;
-	zval *repo = NULL;
-	php_git2_t *_repo = NULL;
-	zval *treeish = NULL;
-	php_git2_t *_treeish = NULL;
-	zval *opts = NULL;
-	int error = 0;
-	git_checkout_opts options = GIT_CHECKOUT_OPTS_INIT;
-	git_object *__treeish = NULL;
+	int result = 0, error = 0;
+	zval *repo = NULL, *treeish = NULL, *opts = NULL;
+	php_git2_t *_repo = NULL, *_treeish = NULL;
+	git_checkout_opts options = {0};
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
-		"r|ra", &repo, &treeish, &opts) == FAILURE) {
+		"rra", &repo, &treeish, &opts) == FAILURE) {
 		return;
 	}
 
@@ -93,8 +82,10 @@ PHP_FUNCTION(git_checkout_tree)
 	}
 
 	ZEND_FETCH_RESOURCE(_repo, php_git2_t*, &repo, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
-	result = git_checkout_tree(PHP_GIT2_V(_repo, repository), __treeish, &options);
+	ZEND_FETCH_RESOURCE(_treeish, php_git2_t*, &treeish, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
+	result = git_checkout_tree(PHP_GIT2_V(_repo, repository), PHP_GIT2_V(_treeish, object), opts);
 	RETURN_LONG(result);
 }
 /* }}} */
 
+

ignore.c

@@ -6,70 +6,59 @@
  */
 PHP_FUNCTION(git_ignore_add_rule)
 {
-	int result = 0;
+	int result = 0, rules_len = 0, error = 0;
 	zval *repo = NULL;
 	php_git2_t *_repo = NULL;
 	char *rules = NULL;
-	int rules_len = 0;
-	int error = 0;
-
+	
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"rs", &repo, &rules, &rules_len) == FAILURE) {
 		return;
 	}
-
+	
 	ZEND_FETCH_RESOURCE(_repo, php_git2_t*, &repo, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
 	result = git_ignore_add_rule(PHP_GIT2_V(_repo, repository), rules);
 	RETURN_LONG(result);
 }
 /* }}} */
 
-
 /* {{{ proto long git_ignore_clear_internal_rules(resource $repo)
  */
 PHP_FUNCTION(git_ignore_clear_internal_rules)
 {
-	int result = 0;
+	int result = 0, error = 0;
 	zval *repo = NULL;
 	php_git2_t *_repo = NULL;
-	int error = 0;
-
+	
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"r", &repo) == FAILURE) {
 		return;
 	}
-
+	
 	ZEND_FETCH_RESOURCE(_repo, php_git2_t*, &repo, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
 	result = git_ignore_clear_internal_rules(PHP_GIT2_V(_repo, repository));
 	RETURN_LONG(result);
 }
 /* }}} */
 
-
-/* {{{ proto long git_ignore_path_is_ignored(resource $repo, string $path)
+/* {{{ proto long git_ignore_path_is_ignored(long $ignored, resource $repo, string $path)
  */
 PHP_FUNCTION(git_ignore_path_is_ignored)
 {
-	int result = 0;
+	int result = 0, path_len = 0, error = 0;
 	long ignored = 0;
 	zval *repo = NULL;
 	php_git2_t *_repo = NULL;
 	char *path = NULL;
-	int path_len = 0;
-	int error = 0;
-
+	
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
-		"rs", &repo, &path, &path_len) == FAILURE) {
+		"lrs", &ignored, &repo, &path, &path_len) == FAILURE) {
 		return;
 	}
-
+	
 	ZEND_FETCH_RESOURCE(_repo, php_git2_t*, &repo, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
-	result = git_ignore_path_is_ignored(&ignored, PHP_GIT2_V(_repo, repository), path);
-	if (php_git2_check_error(error, "git_ignore_path_is_ignored" TSRMLS_CC)) {
-		RETURN_FALSE
-	}
-
-	RETURN_LONG(ignored);
+	result = git_ignore_path_is_ignored(ignored, PHP_GIT2_V(_repo, repository), path);
+	RETURN_BOOL(result);
 }
 /* }}} */