Skip to content

Commit 29d3a48

Browse files
chobiechobie
committed
[patch] update code base
1 parent 3604ff3 commit 29d3a48

File tree

2 files changed

+76
-95
lines changed

2 files changed

+76
-95
lines changed

‎patch.c

+66-92
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
*/
77
PHP_FUNCTION(git_patch_from_diff)
88
{
9-
php_git2_t *result = NULL;
9+
php_git2_t *result = NULL, *_diff = NULL;
1010
git_patch *out = NULL;
1111
zval *diff = NULL;
12-
php_git2_t *_diff = NULL;
1312
long idx = 0;
1413
int error = 0;
1514

@@ -23,12 +22,10 @@ PHP_FUNCTION(git_patch_from_diff)
2322
if (php_git2_check_error(error, "git_patch_from_diff" TSRMLS_CC)) {
2423
RETURN_FALSE;
2524
}
26-
PHP_GIT2_MAKE_RESOURCE(result);
27-
PHP_GIT2_V(result, patch) = out;
28-
result->type = PHP_GIT2_TYPE_PATCH;
29-
result->resource_id = PHP_GIT2_LIST_INSERT(result, git2_resource_handle);
30-
result->should_free_v = 0;
31-
ZVAL_RESOURCE(return_value, result->resource_id);
25+
if (php_git2_make_resource(&result, PHP_GIT2_TYPE_PATCH, out, 1 TSRMLS_CC)) {
26+
RETURN_FALSE;
27+
}
28+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(result));
3229
}
3330
/* }}} */
3431

@@ -37,18 +34,11 @@ PHP_FUNCTION(git_patch_from_diff)
3734
*/
3835
PHP_FUNCTION(git_patch_from_blobs)
3936
{
40-
php_git2_t *result = NULL;
37+
php_git2_t *result = NULL, *_old_blob = NULL, *_new_blob = NULL;
4138
git_patch *out = NULL;
42-
zval *old_blob = NULL;
43-
php_git2_t *_old_blob = NULL;
44-
char *old_as_path = NULL;
45-
int old_as_path_len = 0;
46-
zval *new_blob = NULL;
47-
php_git2_t *_new_blob = NULL;
48-
char *new_as_path = NULL;
49-
int new_as_path_len = 0;
50-
zval *opts = NULL;
51-
int error = 0;
39+
zval *old_blob = NULL, *new_blob = NULL, *opts = NULL;
40+
char *old_as_path = NULL, *new_as_path = NULL;
41+
int old_as_path_len = 0, new_as_path_len = 0, error = 0;
5242

5343
/* TODO(chobie): generate converter */
5444
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -62,31 +52,23 @@ PHP_FUNCTION(git_patch_from_blobs)
6252
if (php_git2_check_error(error, "git_patch_from_blobs" TSRMLS_CC)) {
6353
RETURN_FALSE;
6454
}
65-
PHP_GIT2_MAKE_RESOURCE(result);
66-
PHP_GIT2_V(result, patch) = out;
67-
result->type = PHP_GIT2_TYPE_PATCH;
68-
result->resource_id = PHP_GIT2_LIST_INSERT(result, git2_resource_handle);
69-
result->should_free_v = 0;
70-
ZVAL_RESOURCE(return_value, result->resource_id);
55+
if (php_git2_make_resource(&result, PHP_GIT2_TYPE_PATCH, out, 1 TSRMLS_CC)) {
56+
RETURN_FALSE;
57+
}
58+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(result));
7159
}
7260
/* }}} */
7361

74-
/* {{{ proto resource git_patch_from_blob_and_buffer(resource $old_blob, string $old_as_path, string $buffer, string $buffer_as_path, $opts)
62+
63+
/* {{{ proto resource git_patch_from_blob_and_buffer(resource $old_blob, string $old_as_path, string $buffer, string $buffer_as_path, $opts)
7564
*/
7665
PHP_FUNCTION(git_patch_from_blob_and_buffer)
7766
{
78-
php_git2_t *result = NULL;
67+
php_git2_t *result = NULL, *_old_blob = NULL;
7968
git_patch *out = NULL;
80-
zval *old_blob = NULL;
81-
php_git2_t *_old_blob = NULL;
82-
char *old_as_path = NULL;
83-
int old_as_path_len = 0;
84-
char *buffer = NULL;
85-
int buffer_len = 0;
86-
char *buffer_as_path = NULL;
87-
int buffer_as_path_len = 0;
88-
zval *opts = NULL;
89-
int error = 0;
69+
zval *old_blob = NULL, *opts = NULL;
70+
char *old_as_path = NULL, *buffer = NULL, *buffer_as_path = NULL;
71+
int old_as_path_len = 0, buffer_len = 0, buffer_as_path_len = 0, error = 0;
9072

9173
/* TODO(chobie): generate converter */
9274
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -99,12 +81,10 @@ PHP_FUNCTION(git_patch_from_blob_and_buffer)
9981
if (php_git2_check_error(error, "git_patch_from_blob_and_buffer" TSRMLS_CC)) {
10082
RETURN_FALSE;
10183
}
102-
PHP_GIT2_MAKE_RESOURCE(result);
103-
PHP_GIT2_V(result, patch) = out;
104-
result->type = PHP_GIT2_TYPE_PATCH;
105-
result->resource_id = PHP_GIT2_LIST_INSERT(result, git2_resource_handle);
106-
result->should_free_v = 0;
107-
ZVAL_RESOURCE(return_value, result->resource_id);
84+
if (php_git2_make_resource(&result, PHP_GIT2_TYPE_PATCH, out, 1 TSRMLS_CC)) {
85+
RETURN_FALSE;
86+
}
87+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(result));
10888
}
10989
/* }}} */
11090

@@ -122,8 +102,9 @@ PHP_FUNCTION(git_patch_free)
122102
}
123103

124104
ZEND_FETCH_RESOURCE(_patch, php_git2_t*, &patch, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
125-
if (_patch->should_free_v) {
105+
if (GIT2_SHOULD_FREE(_patch)) {
126106
git_patch_free(PHP_GIT2_V(_patch, patch));
107+
GIT2_SHOULD_FREE(_patch) = 0;
127108
};
128109
zval_ptr_dtor(&patch);
129110
}
@@ -149,7 +130,6 @@ PHP_FUNCTION(git_patch_get_delta)
149130
}
150131
/* }}} */
151132

152-
153133
/* {{{ proto long git_patch_num_hunks(resource $patch)
154134
*/
155135
PHP_FUNCTION(git_patch_num_hunks)
@@ -169,18 +149,14 @@ PHP_FUNCTION(git_patch_num_hunks)
169149
}
170150
/* }}} */
171151

172-
173152
/* {{{ proto long git_patch_line_stats(long $total_context, long $total_additions, long $total_deletions, resource $patch)
174153
*/
175154
PHP_FUNCTION(git_patch_line_stats)
176155
{
177-
int result = 0;
178-
long total_context = 0;
179-
long total_additions = 0;
180-
long total_deletions = 0;
156+
int result = 0, error = 0;
157+
long total_context = 0, total_additions = 0, total_deletions = 0;
181158
zval *patch = NULL;
182159
php_git2_t *_patch = NULL;
183-
int error = 0;
184160

185161
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
186162
"lllr", &total_context, &total_additions, &total_deletions, &patch) == FAILURE) {
@@ -193,17 +169,14 @@ PHP_FUNCTION(git_patch_line_stats)
193169
}
194170
/* }}} */
195171

196-
197172
/* {{{ proto resource git_patch_get_hunk(long $lines_in_hunk, resource $patch, long $hunk_idx)
198173
*/
199174
PHP_FUNCTION(git_patch_get_hunk)
200175
{
201-
php_git2_t *result = NULL;
176+
php_git2_t *result = NULL, *_patch = NULL;
202177
git_diff_hunk *out = NULL;
203-
long lines_in_hunk = 0;
178+
long lines_in_hunk = 0, hunk_idx = 0;
204179
zval *patch = NULL;
205-
php_git2_t *_patch = NULL;
206-
long hunk_idx = 0;
207180
int error = 0;
208181

209182
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -216,25 +189,21 @@ PHP_FUNCTION(git_patch_get_hunk)
216189
if (php_git2_check_error(error, "git_patch_get_hunk" TSRMLS_CC)) {
217190
RETURN_FALSE;
218191
}
219-
PHP_GIT2_MAKE_RESOURCE(result);
220-
PHP_GIT2_V(result, diff_hunk) = out;
221-
result->type = PHP_GIT2_TYPE_DIFF_HUNK;
222-
result->resource_id = PHP_GIT2_LIST_INSERT(result, git2_resource_handle);
223-
result->should_free_v = 0;
224-
ZVAL_RESOURCE(return_value, result->resource_id);
192+
if (php_git2_make_resource(&result, PHP_GIT2_TYPE_DIFF_HUNK, out, 1 TSRMLS_CC)) {
193+
RETURN_FALSE;
194+
}
195+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(result));
225196
}
226197
/* }}} */
227198

228-
229199
/* {{{ proto long git_patch_num_lines_in_hunk(resource $patch, long $hunk_idx)
230200
*/
231201
PHP_FUNCTION(git_patch_num_lines_in_hunk)
232202
{
233-
int result = 0;
203+
int result = 0, error = 0;
234204
zval *patch = NULL;
235205
php_git2_t *_patch = NULL;
236206
long hunk_idx = 0;
237-
int error = 0;
238207

239208
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
240209
"rl", &patch, &hunk_idx) == FAILURE) {
@@ -251,12 +220,10 @@ PHP_FUNCTION(git_patch_num_lines_in_hunk)
251220
*/
252221
PHP_FUNCTION(git_patch_get_line_in_hunk)
253222
{
254-
php_git2_t *result = NULL;
223+
php_git2_t *result = NULL, *_patch = NULL;
255224
git_diff_line *out = NULL;
256225
zval *patch = NULL;
257-
php_git2_t *_patch = NULL;
258-
long hunk_idx = 0;
259-
long line_of_hunk = 0;
226+
long hunk_idx = 0, line_of_hunk = 0;
260227
int error = 0;
261228

262229
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -269,26 +236,21 @@ PHP_FUNCTION(git_patch_get_line_in_hunk)
269236
if (php_git2_check_error(error, "git_patch_get_line_in_hunk" TSRMLS_CC)) {
270237
RETURN_FALSE;
271238
}
272-
PHP_GIT2_MAKE_RESOURCE(result);
273-
PHP_GIT2_V(result, diff_line) = out;
274-
result->type = PHP_GIT2_TYPE_DIFF_LINE;
275-
result->resource_id = PHP_GIT2_LIST_INSERT(result, git2_resource_handle);
276-
result->should_free_v = 0;
277-
ZVAL_RESOURCE(return_value, result->resource_id);
239+
if (php_git2_make_resource(&result, PHP_GIT2_TYPE_DIFF_LINE, out, 1 TSRMLS_CC)) {
240+
RETURN_FALSE;
241+
}
242+
ZVAL_RESOURCE(return_value, GIT2_RVAL_P(result));
278243
}
279244
/* }}} */
280245

281-
282246
/* {{{ proto long git_patch_size(resource $patch, long $include_context, long $include_hunk_headers, long $include_file_headers)
283247
*/
284248
PHP_FUNCTION(git_patch_size)
285249
{
286250
size_t result = 0;
287251
zval *patch = NULL;
288252
php_git2_t *_patch = NULL;
289-
long include_context = 0;
290-
long include_hunk_headers = 0;
291-
long include_file_headers = 0;
253+
long include_context = 0, include_hunk_headers = 0, include_file_headers = 0;
292254

293255
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
294256
"rlll", &patch, &include_context, &include_hunk_headers, &include_file_headers) == FAILURE) {
@@ -301,38 +263,50 @@ PHP_FUNCTION(git_patch_size)
301263
}
302264
/* }}} */
303265

304-
/* {{{ proto long git_patch_print(patch, print_cb, payload)
305-
*/
266+
267+
/* {{{ proto long git_patch_print(resource $patch, Callable $print_cb, $payload)
268+
*/
306269
PHP_FUNCTION(git_patch_print)
307270
{
308-
zval *patch;
309-
php_git2_t *_patch;
310-
zval *print_cb;
311-
php_git2_t *_print_cb;
271+
int result = 0, error = 0;
272+
zval *patch = NULL, *print_cb = NULL, *payload = NULL;
273+
php_git2_t *_patch = NULL;
274+
zend_fcall_info fci = empty_fcall_info;
275+
zend_fcall_info_cache fcc = empty_fcall_info_cache;
276+
php_git2_cb_t *cb = NULL;
312277

313-
/* TODO(chobie): implement this */
314-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "git_patch_print not implemented yet");
315-
return;
278+
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
279+
"rfz", &patch, &fci, &fcc, &payload) == FAILURE) {
280+
return;
281+
}
282+
283+
ZEND_FETCH_RESOURCE(_patch, php_git2_t*, &patch, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
284+
if (php_git2_cb_init(&cb, &fci, &fcc, payload TSRMLS_CC)) {
285+
RETURN_FALSE;
286+
}
287+
//result = git_patch_print(PHP_GIT2_V(_patch, patch), <CHANGEME>, cb);
288+
php_git2_cb_free(cb);
289+
RETURN_LONG(result);
316290
}
291+
/* }}} */
292+
317293

318294
/* {{{ proto long git_patch_to_str(string $string, resource $patch)
319295
*/
320296
PHP_FUNCTION(git_patch_to_str)
321297
{
322-
int result = 0;
298+
int result = 0, string_len = 0, error = 0;
323299
char *string = NULL;
324-
int string_len = 0;
325300
zval *patch = NULL;
326301
php_git2_t *_patch = NULL;
327-
int error = 0;
328302

329303
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
330304
"sr", &string, &string_len, &patch) == FAILURE) {
331305
return;
332306
}
333307

334308
ZEND_FETCH_RESOURCE(_patch, php_git2_t*, &patch, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
335-
result = git_patch_to_str(string, PHP_GIT2_V(_patch, patch));
309+
result = git_patch_to_str(&string, PHP_GIT2_V(_patch, patch));
336310
RETURN_LONG(result);
337311
}
338312
/* }}} */

‎reset.c

+10-3
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,24 @@ PHP_FUNCTION(git_reset)
2828
PHP_FUNCTION(git_reset_default)
2929
{
3030
int result = 0, error = 0;
31-
zval *repo = NULL, *target = NULL, *pathspecs = NULL;
31+
zval *repo = NULL, *target = NULL, *pathspecs = NULL, *array = NULL;
3232
php_git2_t *_repo = NULL, *_target = NULL;
33+
git_strarray _pathspecs = {0};
3334

3435
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
3536
"rra", &repo, &target, &pathspecs) == FAILURE) {
3637
return;
3738
}
38-
39+
if (zend_hash_num_elements(pathspecs) > 0) {
40+
php_git2_array_to_strarray(&_pathspecs, pathspecs TSRMLS_CC);
41+
}
3942
ZEND_FETCH_RESOURCE(_repo, php_git2_t*, &repo, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
4043
ZEND_FETCH_RESOURCE(_target, php_git2_t*, &target, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
41-
result = git_reset_default(PHP_GIT2_V(_repo, repository), PHP_GIT2_V(_target, object), pathspecs);
44+
result = git_reset_default(PHP_GIT2_V(_repo, repository), PHP_GIT2_V(_target, object), &_pathspecs);
45+
if (zend_hash_num_elements(pathspecs) > 0) {
46+
git_strarray_free(&array);
47+
}
48+
4249
RETURN_LONG(result);
4350
}
4451
/* }}} */

0 commit comments

Comments
 (0)