add giterr

Author: chobie

config.m4

@@ -7,7 +7,7 @@ PHP_ARG_ENABLE(git2-debug, for git2 debug support,
 if test $PHP_GIT2 != "no"; then
 	PHP_SUBST(GIT2_SHARED_LIBADD)
 
-	PHP_NEW_EXTENSION(git2, php_git2.c repository.c commit.c tree.c clone.c blob.c helper.c revwalk.c treebuilder.c reference.c g_config.c object.c index.c revparse.c branch.c tag.c status.c cred.c remote.c transport.c diff.c checkout.c filter.c ignore.c indexer.c pathspec.c patch.c merge.c note.c odb.c reflog.c blame.c packbuilder.c stash.c signature.c attr.c reset.c message.c submodule.c, $ext_shared)
+	PHP_NEW_EXTENSION(git2, php_git2.c repository.c commit.c tree.c clone.c blob.c helper.c revwalk.c treebuilder.c reference.c g_config.c object.c index.c revparse.c branch.c tag.c status.c cred.c remote.c transport.c diff.c checkout.c filter.c ignore.c indexer.c pathspec.c patch.c merge.c note.c odb.c reflog.c blame.c packbuilder.c stash.c signature.c attr.c reset.c message.c submodule.c giterr.c, $ext_shared)
 	PHP_ADD_INCLUDE([$ext_srcdir/libgit2/include])
 
 	# for now

giterr.c

@@ -0,0 +1,81 @@
+#include "php_git2.h"
+#include "php_git2_priv.h"
+#include "giterr.h"
+
+static void php_git2_error_to_array(const git_error *error, zval **out)
+{
+	zval *array;
+
+	MAKE_STD_ZVAL(array);
+	array_init(array);
+	if (error == NULL) {
+		add_next_index_string(array, "", 1);
+		add_next_index_long(array, 0);
+	} else {
+		add_next_index_string(array, error->message, 1);
+		add_next_index_long(array, error->klass);
+	}
+	*out = array;
+}
+
+/* {{{ proto resource giterr_last()
+ */
+PHP_FUNCTION(giterr_last)
+{
+	const git_error *result = {0};
+	zval *array;
+
+	result = giterr_last();
+	php_git2_error_to_array(result, &array);
+
+	RETURN_ZVAL(array, 0, 1);
+}
+/* }}} */
+
+/* {{{ proto void giterr_clear()
+ */
+PHP_FUNCTION(giterr_clear)
+{
+	giterr_clear();
+}
+/* }}} */
+
+/* {{{ proto array giterr_detach()
+ */
+PHP_FUNCTION(giterr_detach)
+{
+	int result = 0, error = 0;
+	git_error cpy;
+	zval *array;
+
+	result = giterr_detach(&cpy);
+	php_git2_error_to_array(&cpy, &array);
+	RETURN_ZVAL(array, 0, 1);
+}
+/* }}} */
+
+/* {{{ proto void giterr_set_str(long $error_class, string $string)
+ */
+PHP_FUNCTION(giterr_set_str)
+{
+	long error_class = 0;
+	char *string = NULL;
+	int string_len = 0;
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+		"ls", &error_class, &string, &string_len) == FAILURE) {
+		return;
+	}
+	
+	giterr_set_str(error_class, string);
+}
+/* }}} */
+
+/* {{{ proto void giterr_set_oom()
+ */
+PHP_FUNCTION(giterr_set_oom)
+{
+	giterr_set_oom();
+}
+/* }}} */
+

giterr.h

@@ -0,0 +1,70 @@
+/*
+ * PHP Libgit2 Extension
+ *
+ * https://github.com/libgit2/php-git
+ *
+ * Copyright 2014 Shuhei Tanuma.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef PHP_GIT2_GITERR_H
+#define PHP_GIT2_GITERR_H
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_giterr_last, 0, 0, 1)
+	ZEND_ARG_INFO(0, void)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_giterr_clear, 0, 0, 1)
+	ZEND_ARG_INFO(0, void)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_giterr_detach, 0, 0, 1)
+	ZEND_ARG_INFO(0, cpy)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_giterr_set_str, 0, 0, 2)
+	ZEND_ARG_INFO(0, error_class)
+	ZEND_ARG_INFO(0, string)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_giterr_set_oom, 0, 0, 1)
+	ZEND_ARG_INFO(0, void)
+ZEND_END_ARG_INFO()
+
+/* {{{ proto resource giterr_last(void)
+*/
+PHP_FUNCTION(giterr_last);
+
+/* {{{ proto void giterr_clear(void)
+*/
+PHP_FUNCTION(giterr_clear);
+
+/* {{{ proto long giterr_detach(cpy)
+*/
+PHP_FUNCTION(giterr_detach);
+
+/* {{{ proto void giterr_set_str(error_class, string)
+*/
+PHP_FUNCTION(giterr_set_str);
+
+/* {{{ proto void giterr_set_oom(void)
+*/
+PHP_FUNCTION(giterr_set_oom);
+
+#endif

php_git2.c

@@ -62,6 +62,7 @@
 #include "message.h"
 #include "submodule.h"
 #include "attr.h"
+#include "giterr.h"
 
 int git2_resource_handle;
 
@@ -852,6 +853,13 @@ static zend_function_entry php_git2_functions[] = {
 	PHP_FE(git_attr_cache_flush, arginfo_git_attr_cache_flush)
 	PHP_FE(git_attr_add_macro, arginfo_git_attr_add_macro)
 
+	/* giterr */
+	PHP_FE(giterr_last, arginfo_giterr_last)
+	PHP_FE(giterr_clear, arginfo_giterr_clear)
+	PHP_FE(giterr_detach, arginfo_giterr_detach)
+	PHP_FE(giterr_set_str, arginfo_giterr_set_str)
+	PHP_FE(giterr_set_oom, arginfo_giterr_set_oom)
+
 	/* misc */
 	PHP_FE(git_resource_type, arginfo_git_resource_type)
 	PHP_FE_END