fix warnings

chobie · chobie · commit 38cdbb05cb2f · 2014-01-14T08:03:15.000+09:00
diff --git a/diff.c b/diff.c
@@ -76,7 +76,7 @@ PHP_FUNCTION(git_diff_tree_to_index)
 	if (php_git2_make_resource(&_diff, PHP_GIT2_TYPE_DIFF, diff, 0 TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
-	ZVAL_RESOURCE(return_value, GIT_RVAL_P(_diff));
+	ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_diff));
 
 }
 /* }}} */
@@ -101,7 +101,7 @@ PHP_FUNCTION(git_diff_index_to_workdir)
 	if (php_git2_make_resource(&_diff, PHP_GIT2_TYPE_DIFF, diff, 0 TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
-	ZVAL_RESOURCE(return_value, GIT_RVAL_P(_diff));
+	ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_diff));
 
 }
 /* }}} */
@@ -147,7 +147,7 @@ PHP_FUNCTION(git_diff_tree_to_workdir_with_index)
 	if (php_git2_make_resource(&_diff, PHP_GIT2_TYPE_DIFF, diff, 0 TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
-	ZVAL_RESOURCE(return_value, GIT_RVAL_P(_diff));
+	ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_diff));
 }
 /* }}} */
 
diff --git a/helper.c b/helper.c
@@ -111,9 +111,10 @@ void php_git2_signature_to_array(const git_signature *signature, zval **out TSRM
 	tzobj = (php_timezone_obj *) zend_object_store_get_object(timezone TSRMLS_CC);
 	tzobj->initialized = 1;
 	tzobj->type = TIMELIB_ZONETYPE_OFFSET;
-	tzobj->tzi.utc_offset = -signature->when.offset; /* NOTE(chobie): probably this fine */
+	tzobj->tzi.utc_offset = -signature->when.offset; // doesn't work
 
-	php_date_initialize(zend_object_store_get_object(datetime TSRMLS_CC), NULL, 0, NULL, timezone, 0 TSRMLS_CC);
+	/* TODO(chobie): how do i set offset? */
+	php_date_initialize(zend_object_store_get_object(datetime TSRMLS_CC), time_str, strlen(time_str), NULL, timezone, 0 TSRMLS_CC);
 
 	add_assoc_string_ex(result, ZEND_STRS("name"), signature->name, 1);
 	add_assoc_string_ex(result, ZEND_STRS("email"), signature->email, 1);
diff --git a/object.c b/object.c
@@ -256,7 +256,7 @@ PHP_FUNCTION(git_object_peel)
 	if (php_git2_make_resource(&_result, PHP_GIT2_TYPE_OBJECT, peeled, 1 TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
-	ZVAL_RESOURCE(return_value, GIT_RVAL_P(_result));
+	ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_result));
 }
 /* }}} */
 
@@ -279,6 +279,6 @@ PHP_FUNCTION(git_object_dup)
 	if (php_git2_make_resource(&_result, PHP_GIT2_TYPE_OBJECT, dest, 1 TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
-	ZVAL_RESOURCE(return_value, GIT_RVAL_P(_result));
+	ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_result));
 }
 /* }}} */
diff --git a/php_git2.c b/php_git2.c
@@ -135,7 +135,7 @@ int php_git2_make_resource(php_git2_t **out, enum php_git2_resource_type type, v
 			PHP_GIT2_V(result, commit) = (git_commit*)resource;
 			break;
 		case PHP_GIT2_TYPE_TREE:
-			PHP_GIT2_V(result, commit) = (git_tree*)resource;
+			PHP_GIT2_V(result, tree) = (git_tree*)resource;
 			break;
 		case PHP_GIT2_TYPE_TREE_ENTRY:
 			PHP_GIT2_V(result, tree_entry) = (git_tree_entry*)resource;
@@ -236,6 +236,33 @@ int php_git2_make_resource(php_git2_t **out, enum php_git2_resource_type type, v
 		case PHP_GIT2_TYPE_NOTE_ITERATOR:
 			PHP_GIT2_V(result, note_iterator) = (git_note_iterator*)resource;
 			break;
+		case PHP_GIT2_TYPE_ODB_STREAM:
+			PHP_GIT2_V(result, odb_stream) = (git_odb_stream*)resource;
+			break;
+		case PHP_GIT2_TYPE_ODB_OBJECT:
+			PHP_GIT2_V(result, odb_object) = (git_odb_object*)resource;
+			break;
+		case PHP_GIT2_TYPE_ODB_WRITEPACK:
+			PHP_GIT2_V(result, odb_writepack) = (git_odb_writepack*)resource;
+			break;
+		case PHP_GIT2_TYPE_ODB_BACKEND:
+			PHP_GIT2_V(result, odb_backend) = (git_odb_backend*)resource;
+			break;
+		case PHP_GIT2_TYPE_REFLOG:
+			PHP_GIT2_V(result, reflog) = (git_reflog*)resource;
+			break;
+		case PHP_GIT2_TYPE_REFLOG_ENTRY:
+			PHP_GIT2_V(result, reflog_entry) = (git_reflog_entry*)resource;
+			break;
+		case PHP_GIT2_TYPE_BLAME:
+			PHP_GIT2_V(result, blame) = (git_blame*)resource;
+			break;
+		case PHP_GIT2_TYPE_PACKBUILDER:
+			PHP_GIT2_V(result, packbuilder) = (git_packbuilder*)resource;
+			break;
+		case PHP_GIT2_TYPE_SUBMODULE:
+			PHP_GIT2_V(result, submodule) = (git_submodule*)resource;
+			break;
 		default:
 			php_error_docref(NULL TSRMLS_CC, E_ERROR, "passed resource type does not support. probably bug.");
 	}
diff --git a/reflog.c b/reflog.c
@@ -174,7 +174,7 @@ PHP_FUNCTION(git_reflog_entry_byindex)
 	if (php_git2_make_resource(&_result, PHP_GIT2_TYPE_REFLOG_ENTRY, result, 0 TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
-	ZVAL_RESOURCE(return_value, GIT_RVAL_P(_result));
+	ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_result));
 }
 /* }}} */
 
diff --git a/transport.c b/transport.c
@@ -17,7 +17,7 @@ static int php_git2_transport_cb(git_transport **out, git_remote *owner, void *p
 	if (php_git2_make_resource(&_param_owner, PHP_GIT2_TYPE_REMOTE, owner, 0 TSRMLS_CC)) {
 		return 0;
 	}
-	ZVAL_RESOURCE(param_owner, GIT_RVAL_P(_param_owner));
+	ZVAL_RESOURCE(param_owner, GIT2_RVAL_P(_param_owner));
 
 	if (php_git2_call_function_v(p->fci, p->fcc TSRMLS_CC, &retval_ptr, 2, &param_owner, &p->payload)) {
 		return GIT_EUSER;

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ PHP_FUNCTION(git_diff_tree_to_index)`
`76`	`76`	`if (php_git2_make_resource(&_diff, PHP_GIT2_TYPE_DIFF, diff, 0 TSRMLS_CC)) {`
`77`	`77`	`RETURN_FALSE;`
`78`	`78`	`}`
`79`		`- ZVAL_RESOURCE(return_value, GIT_RVAL_P(_diff));`
	`79`	`+ ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_diff));`
`80`	`80`
`81`	`81`	`}`
`82`	`82`	`/* }}} */`
`@@ -101,7 +101,7 @@ PHP_FUNCTION(git_diff_index_to_workdir)`
`101`	`101`	`if (php_git2_make_resource(&_diff, PHP_GIT2_TYPE_DIFF, diff, 0 TSRMLS_CC)) {`
`102`	`102`	`RETURN_FALSE;`
`103`	`103`	`}`
`104`		`- ZVAL_RESOURCE(return_value, GIT_RVAL_P(_diff));`
	`104`	`+ ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_diff));`
`105`	`105`
`106`	`106`	`}`
`107`	`107`	`/* }}} */`
`@@ -147,7 +147,7 @@ PHP_FUNCTION(git_diff_tree_to_workdir_with_index)`
`147`	`147`	`if (php_git2_make_resource(&_diff, PHP_GIT2_TYPE_DIFF, diff, 0 TSRMLS_CC)) {`
`148`	`148`	`RETURN_FALSE;`
`149`	`149`	`}`
`150`		`- ZVAL_RESOURCE(return_value, GIT_RVAL_P(_diff));`
	`150`	`+ ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_diff));`
`151`	`151`	`}`
`152`	`152`	`/* }}} */`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ PHP_FUNCTION(git_object_peel)`
`256`	`256`	`if (php_git2_make_resource(&_result, PHP_GIT2_TYPE_OBJECT, peeled, 1 TSRMLS_CC)) {`
`257`	`257`	`RETURN_FALSE;`
`258`	`258`	`}`
`259`		`- ZVAL_RESOURCE(return_value, GIT_RVAL_P(_result));`
	`259`	`+ ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_result));`
`260`	`260`	`}`
`261`	`261`	`/* }}} */`
`262`	`262`
`@@ -279,6 +279,6 @@ PHP_FUNCTION(git_object_dup)`
`279`	`279`	`if (php_git2_make_resource(&_result, PHP_GIT2_TYPE_OBJECT, dest, 1 TSRMLS_CC)) {`
`280`	`280`	`RETURN_FALSE;`
`281`	`281`	`}`
`282`		`- ZVAL_RESOURCE(return_value, GIT_RVAL_P(_result));`
	`282`	`+ ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_result));`
`283`	`283`	`}`
`284`	`284`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ PHP_FUNCTION(git_reflog_entry_byindex)`
`174`	`174`	`if (php_git2_make_resource(&_result, PHP_GIT2_TYPE_REFLOG_ENTRY, result, 0 TSRMLS_CC)) {`
`175`	`175`	`RETURN_FALSE;`
`176`	`176`	`}`
`177`		`- ZVAL_RESOURCE(return_value, GIT_RVAL_P(_result));`
	`177`	`+ ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_result));`
`178`	`178`	`}`
`179`	`179`	`/* }}} */`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ static int php_git2_transport_cb(git_transport *out, git_remote owner, void *p`
`17`	`17`	`if (php_git2_make_resource(&_param_owner, PHP_GIT2_TYPE_REMOTE, owner, 0 TSRMLS_CC)) {`
`18`	`18`	`return 0;`
`19`	`19`	`}`
`20`		`- ZVAL_RESOURCE(param_owner, GIT_RVAL_P(_param_owner));`
	`20`	`+ ZVAL_RESOURCE(param_owner, GIT2_RVAL_P(_param_owner));`
`21`	`21`
`22`	`22`	`if (php_git2_call_function_v(p->fci, p->fcc TSRMLS_CC, &retval_ptr, 2, &param_owner, &p->payload)) {`
`23`	`23`	`return GIT_EUSER;`