Skip to content

Commit 38cdbb0

Browse files
chobiechobie
committed
fix warnings
1 parent 76fc5fa commit 38cdbb0

File tree

6 files changed

+38
-10
lines changed

6 files changed

+38
-10
lines changed

‎diff.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ PHP_FUNCTION(git_diff_tree_to_index)
7676
if (php_git2_make_resource(&_diff, PHP_GIT2_TYPE_DIFF, diff, 0 TSRMLS_CC)) {
7777
RETURN_FALSE;
7878
}
79-
ZVAL_RESOURCE(return_value, GIT_RVAL_P(_diff));
79+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_diff));
8080

8181
}
8282
/* }}} */
@@ -101,7 +101,7 @@ PHP_FUNCTION(git_diff_index_to_workdir)
101101
if (php_git2_make_resource(&_diff, PHP_GIT2_TYPE_DIFF, diff, 0 TSRMLS_CC)) {
102102
RETURN_FALSE;
103103
}
104-
ZVAL_RESOURCE(return_value, GIT_RVAL_P(_diff));
104+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_diff));
105105

106106
}
107107
/* }}} */
@@ -147,7 +147,7 @@ PHP_FUNCTION(git_diff_tree_to_workdir_with_index)
147147
if (php_git2_make_resource(&_diff, PHP_GIT2_TYPE_DIFF, diff, 0 TSRMLS_CC)) {
148148
RETURN_FALSE;
149149
}
150-
ZVAL_RESOURCE(return_value, GIT_RVAL_P(_diff));
150+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_diff));
151151
}
152152
/* }}} */
153153

‎helper.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,10 @@ void php_git2_signature_to_array(const git_signature *signature, zval **out TSRM
111111
tzobj = (php_timezone_obj *) zend_object_store_get_object(timezone TSRMLS_CC);
112112
tzobj->initialized = 1;
113113
tzobj->type = TIMELIB_ZONETYPE_OFFSET;
114-
tzobj->tzi.utc_offset = -signature->when.offset; /* NOTE(chobie): probably this fine */
114+
tzobj->tzi.utc_offset = -signature->when.offset; // doesn't work
115115

116-
php_date_initialize(zend_object_store_get_object(datetime TSRMLS_CC), NULL, 0, NULL, timezone, 0 TSRMLS_CC);
116+
/* TODO(chobie): how do i set offset? */
117+
php_date_initialize(zend_object_store_get_object(datetime TSRMLS_CC), time_str, strlen(time_str), NULL, timezone, 0 TSRMLS_CC);
117118

118119
add_assoc_string_ex(result, ZEND_STRS("name"), signature->name, 1);
119120
add_assoc_string_ex(result, ZEND_STRS("email"), signature->email, 1);

‎object.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ PHP_FUNCTION(git_object_peel)
256256
if (php_git2_make_resource(&_result, PHP_GIT2_TYPE_OBJECT, peeled, 1 TSRMLS_CC)) {
257257
RETURN_FALSE;
258258
}
259-
ZVAL_RESOURCE(return_value, GIT_RVAL_P(_result));
259+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_result));
260260
}
261261
/* }}} */
262262

@@ -279,6 +279,6 @@ PHP_FUNCTION(git_object_dup)
279279
if (php_git2_make_resource(&_result, PHP_GIT2_TYPE_OBJECT, dest, 1 TSRMLS_CC)) {
280280
RETURN_FALSE;
281281
}
282-
ZVAL_RESOURCE(return_value, GIT_RVAL_P(_result));
282+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_result));
283283
}
284284
/* }}} */

‎php_git2.c‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ int php_git2_make_resource(php_git2_t **out, enum php_git2_resource_type type, v
135135
PHP_GIT2_V(result, commit) = (git_commit*)resource;
136136
break;
137137
case PHP_GIT2_TYPE_TREE:
138-
PHP_GIT2_V(result, commit) = (git_tree*)resource;
138+
PHP_GIT2_V(result, tree) = (git_tree*)resource;
139139
break;
140140
case PHP_GIT2_TYPE_TREE_ENTRY:
141141
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
236236
case PHP_GIT2_TYPE_NOTE_ITERATOR:
237237
PHP_GIT2_V(result, note_iterator) = (git_note_iterator*)resource;
238238
break;
239+
case PHP_GIT2_TYPE_ODB_STREAM:
240+
PHP_GIT2_V(result, odb_stream) = (git_odb_stream*)resource;
241+
break;
242+
case PHP_GIT2_TYPE_ODB_OBJECT:
243+
PHP_GIT2_V(result, odb_object) = (git_odb_object*)resource;
244+
break;
245+
case PHP_GIT2_TYPE_ODB_WRITEPACK:
246+
PHP_GIT2_V(result, odb_writepack) = (git_odb_writepack*)resource;
247+
break;
248+
case PHP_GIT2_TYPE_ODB_BACKEND:
249+
PHP_GIT2_V(result, odb_backend) = (git_odb_backend*)resource;
250+
break;
251+
case PHP_GIT2_TYPE_REFLOG:
252+
PHP_GIT2_V(result, reflog) = (git_reflog*)resource;
253+
break;
254+
case PHP_GIT2_TYPE_REFLOG_ENTRY:
255+
PHP_GIT2_V(result, reflog_entry) = (git_reflog_entry*)resource;
256+
break;
257+
case PHP_GIT2_TYPE_BLAME:
258+
PHP_GIT2_V(result, blame) = (git_blame*)resource;
259+
break;
260+
case PHP_GIT2_TYPE_PACKBUILDER:
261+
PHP_GIT2_V(result, packbuilder) = (git_packbuilder*)resource;
262+
break;
263+
case PHP_GIT2_TYPE_SUBMODULE:
264+
PHP_GIT2_V(result, submodule) = (git_submodule*)resource;
265+
break;
239266
default:
240267
php_error_docref(NULL TSRMLS_CC, E_ERROR, "passed resource type does not support. probably bug.");
241268
}

‎reflog.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ PHP_FUNCTION(git_reflog_entry_byindex)
174174
if (php_git2_make_resource(&_result, PHP_GIT2_TYPE_REFLOG_ENTRY, result, 0 TSRMLS_CC)) {
175175
RETURN_FALSE;
176176
}
177-
ZVAL_RESOURCE(return_value, GIT_RVAL_P(_result));
177+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(_result));
178178
}
179179
/* }}} */
180180

‎transport.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ static int php_git2_transport_cb(git_transport **out, git_remote *owner, void *p
1717
if (php_git2_make_resource(&_param_owner, PHP_GIT2_TYPE_REMOTE, owner, 0 TSRMLS_CC)) {
1818
return 0;
1919
}
20-
ZVAL_RESOURCE(param_owner, GIT_RVAL_P(_param_owner));
20+
ZVAL_RESOURCE(param_owner, GIT2_RVAL_P(_param_owner));
2121

2222
if (php_git2_call_function_v(p->fci, p->fcc TSRMLS_CC, &retval_ptr, 2, &param_owner, &p->payload)) {
2323
return GIT_EUSER;

0 commit comments

Comments
 (0)