1 |
commit: ff1f335f348043c36446c60ba70d4249011a7bff |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 3 17:29:09 2022 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 3 17:30:43 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff1f335f |
7 |
|
8 |
dev-php/pecl-xdiff: Drop old |
9 |
|
10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
11 |
|
12 |
dev-php/pecl-xdiff/Manifest | 1 - |
13 |
dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch | 214 ----------- |
14 |
dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch | 39 -- |
15 |
dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch | 467 ------------------------ |
16 |
dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild | 30 -- |
17 |
5 files changed, 751 deletions(-) |
18 |
|
19 |
diff --git a/dev-php/pecl-xdiff/Manifest b/dev-php/pecl-xdiff/Manifest |
20 |
index eabc5e97f01c..8f1ebee3f19a 100644 |
21 |
--- a/dev-php/pecl-xdiff/Manifest |
22 |
+++ b/dev-php/pecl-xdiff/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST xdiff-2.0.1.tgz 10418 BLAKE2B d80afd629db788343e5804925fb8a9971cb0df2db6462be5adcace7e15e9b7fb2bf52cbb49f900878659fcf5e91c69b721c01e01f04876e8245ecc8094f0be61 SHA512 43f2bddac82ac19ac688ae7dad3fef65b0d8887c0e6adefd1fc15236582c31d78a54538903760270dee294ca8b8ba3def48bfa9b1d44160bcc450f5c6516402a |
25 |
DIST xdiff-2.1.0.tgz 25150 BLAKE2B 3325cc5d3494ec0eb1e161b5321554b60aedaa90e1173a4d1e9b530f734ce80b39dc680fdc4bd5379094175a8719586e5900d5426f4df0ef78b5b40839515664 SHA512 6576f60d7e7a49bcfac3ba51c72ed0ed9ab1b7c1c9bb1e97923fc431cf033c907aa150ddecd452e4bc6c5338ed4110584464428fcd8c34a6c4c536412204a548 |
26 |
|
27 |
diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch |
28 |
deleted file mode 100644 |
29 |
index 80bebf7dfddd..000000000000 |
30 |
--- a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch |
31 |
+++ /dev/null |
32 |
@@ -1,214 +0,0 @@ |
33 |
-From 2afb71ae1d6bcebe66f2e52019222a117c607f66 Mon Sep 17 00:00:00 2001 |
34 |
-From: Rasmus Lerdorf <rasmus@×××××××.com> |
35 |
-Date: Thu, 14 Jan 2021 08:23:43 -0800 |
36 |
-Subject: [PATCH] Version 2.1.0 PHP 8 support Drop PHP 5 support |
37 |
- |
38 |
-diff --git a/xdiff.stub.php b/xdiff.stub.php |
39 |
-new file mode 100644 |
40 |
-index 0000000..4597e7f |
41 |
---- /dev/null |
42 |
-+++ b/xdiff.stub.php |
43 |
-@@ -0,0 +1,84 @@ |
44 |
-+<?php |
45 |
-+/** @generate-function-entries */ |
46 |
-+ |
47 |
-+/** |
48 |
-+ * @param string $str1 |
49 |
-+ * @param string $str2 |
50 |
-+ * @param int $context |
51 |
-+ * @param bool $minimal |
52 |
-+ * @return string|false |
53 |
-+ */ |
54 |
-+function xdiff_string_diff(string $str1, string $str2, int $context = 3, bool $minimal = false) {} |
55 |
-+ |
56 |
-+function xdiff_file_diff(string $file1, string $file2, string $dest, int $context = 3, bool $minimal = false): bool {} |
57 |
-+ |
58 |
-+/** |
59 |
-+ * @param string $str1 |
60 |
-+ * @param string $str2 |
61 |
-+ * @return string|false |
62 |
-+ * @alias xdiff_string_bdiff |
63 |
-+ */ |
64 |
-+function xdiff_string_diff_binary(string $str1, string $str2) {} |
65 |
-+ |
66 |
-+/** @alias xdiff_file_bdiff */ |
67 |
-+function xdiff_file_diff_binary(string $file1, string $file2, string $dest): bool {} |
68 |
-+ |
69 |
-+/** |
70 |
-+ * @param string $str1 |
71 |
-+ * @param string $str2 |
72 |
-+ * @return string|false |
73 |
-+ */ |
74 |
-+function xdiff_string_rabdiff(string $str1, string $str2) {} |
75 |
-+ |
76 |
-+function xdiff_file_rabdiff(string $file1, string $file2, string $dest): bool {} |
77 |
-+ |
78 |
-+function xdiff_file_bdiff_size(string $file1, string $file2, string $dest): bool {} |
79 |
-+ |
80 |
-+function xdiff_string_bdiff_size(string $file1, string $file2, string $dest): bool {} |
81 |
-+ |
82 |
-+/** |
83 |
-+ * @param string $file |
84 |
-+ * @param string $patch |
85 |
-+ * @param string $dest |
86 |
-+ * @param int $flags |
87 |
-+ * @return string|bool |
88 |
-+ */ |
89 |
-+function xdiff_file_patch(string $file, string $patch, string $dest, int $flags=XDIFF_PATCH_NORMAL) {} |
90 |
-+ |
91 |
-+/** |
92 |
-+ * @param string $file |
93 |
-+ * @param string $patch |
94 |
-+ * @param int $flags |
95 |
-+ * @param string $error |
96 |
-+ * @return string|bool |
97 |
-+ */ |
98 |
-+function xdiff_string_patch(string $file, string $patch, int $flags=XDIFF_PATCH_NORMAL, string &$error=null) {} |
99 |
-+ |
100 |
-+/** @alias xdiff_file_bpatch */ |
101 |
-+function xdiff_file_patch_binary(string $file, string $patch, string $dest): bool {} |
102 |
-+ |
103 |
-+/** |
104 |
-+ * @param string $file |
105 |
-+ * @param string $patch |
106 |
-+ * @return string|false |
107 |
-+ * @alias xdiff_string_bpatch |
108 |
-+ */ |
109 |
-+function xdiff_string_patch_binary(string $str, string $patch) {} |
110 |
-+ |
111 |
-+/** |
112 |
-+ * @param string $file1 |
113 |
-+ * @param string $file2 |
114 |
-+ * @param string $file3 |
115 |
-+ * @param string $dest |
116 |
-+ * @return string|bool |
117 |
-+ */ |
118 |
-+function xdiff_file_merge3(string $file1, string $file2, string $file3, string $dest) {} |
119 |
-+ |
120 |
-+/** |
121 |
-+ * @param string $str1 |
122 |
-+ * @param string $str2 |
123 |
-+ * @param string $str3 |
124 |
-+ * @param string $error |
125 |
-+ * @return string|bool |
126 |
-+ */ |
127 |
-+function xdiff_string_merge3(string $str1, string $str2, string $str3, string &$error=null) {} |
128 |
-diff --git a/xdiff_arginfo.h b/xdiff_arginfo.h |
129 |
-new file mode 100644 |
130 |
-index 0000000..2016f7e |
131 |
---- /dev/null |
132 |
-+++ b/xdiff_arginfo.h |
133 |
-@@ -0,0 +1,110 @@ |
134 |
-+/* This is a generated file, edit the .stub.php file instead. |
135 |
-+ * Stub hash: ec3a63aa4462f084433c3576ad532de87da7f867 */ |
136 |
-+ |
137 |
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_diff, 0, 0, 2) |
138 |
-+ ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0) |
139 |
-+ ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0) |
140 |
-+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_LONG, 0, "3") |
141 |
-+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, minimal, _IS_BOOL, 0, "false") |
142 |
-+ZEND_END_ARG_INFO() |
143 |
-+ |
144 |
-+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xdiff_file_diff, 0, 3, _IS_BOOL, 0) |
145 |
-+ ZEND_ARG_TYPE_INFO(0, file1, IS_STRING, 0) |
146 |
-+ ZEND_ARG_TYPE_INFO(0, file2, IS_STRING, 0) |
147 |
-+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) |
148 |
-+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_LONG, 0, "3") |
149 |
-+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, minimal, _IS_BOOL, 0, "false") |
150 |
-+ZEND_END_ARG_INFO() |
151 |
-+ |
152 |
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_diff_binary, 0, 0, 2) |
153 |
-+ ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0) |
154 |
-+ ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0) |
155 |
-+ZEND_END_ARG_INFO() |
156 |
-+ |
157 |
-+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xdiff_file_diff_binary, 0, 3, _IS_BOOL, 0) |
158 |
-+ ZEND_ARG_TYPE_INFO(0, file1, IS_STRING, 0) |
159 |
-+ ZEND_ARG_TYPE_INFO(0, file2, IS_STRING, 0) |
160 |
-+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) |
161 |
-+ZEND_END_ARG_INFO() |
162 |
-+ |
163 |
-+#define arginfo_xdiff_string_rabdiff arginfo_xdiff_string_diff_binary |
164 |
-+ |
165 |
-+#define arginfo_xdiff_file_rabdiff arginfo_xdiff_file_diff_binary |
166 |
-+ |
167 |
-+#define arginfo_xdiff_file_bdiff_size arginfo_xdiff_file_diff_binary |
168 |
-+ |
169 |
-+#define arginfo_xdiff_string_bdiff_size arginfo_xdiff_file_diff_binary |
170 |
-+ |
171 |
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_file_patch, 0, 0, 3) |
172 |
-+ ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0) |
173 |
-+ ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0) |
174 |
-+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) |
175 |
-+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "XDIFF_PATCH_NORMAL") |
176 |
-+ZEND_END_ARG_INFO() |
177 |
-+ |
178 |
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_patch, 0, 0, 2) |
179 |
-+ ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0) |
180 |
-+ ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0) |
181 |
-+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "XDIFF_PATCH_NORMAL") |
182 |
-+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, error, IS_STRING, 0, "null") |
183 |
-+ZEND_END_ARG_INFO() |
184 |
-+ |
185 |
-+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xdiff_file_patch_binary, 0, 3, _IS_BOOL, 0) |
186 |
-+ ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0) |
187 |
-+ ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0) |
188 |
-+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) |
189 |
-+ZEND_END_ARG_INFO() |
190 |
-+ |
191 |
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_patch_binary, 0, 0, 2) |
192 |
-+ ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0) |
193 |
-+ ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0) |
194 |
-+ZEND_END_ARG_INFO() |
195 |
-+ |
196 |
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_file_merge3, 0, 0, 4) |
197 |
-+ ZEND_ARG_TYPE_INFO(0, file1, IS_STRING, 0) |
198 |
-+ ZEND_ARG_TYPE_INFO(0, file2, IS_STRING, 0) |
199 |
-+ ZEND_ARG_TYPE_INFO(0, file3, IS_STRING, 0) |
200 |
-+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) |
201 |
-+ZEND_END_ARG_INFO() |
202 |
-+ |
203 |
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_merge3, 0, 0, 3) |
204 |
-+ ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0) |
205 |
-+ ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0) |
206 |
-+ ZEND_ARG_TYPE_INFO(0, str3, IS_STRING, 0) |
207 |
-+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, error, IS_STRING, 0, "null") |
208 |
-+ZEND_END_ARG_INFO() |
209 |
-+ |
210 |
-+ |
211 |
-+ZEND_FUNCTION(xdiff_string_diff); |
212 |
-+ZEND_FUNCTION(xdiff_file_diff); |
213 |
-+ZEND_FUNCTION(xdiff_string_bdiff); |
214 |
-+ZEND_FUNCTION(xdiff_file_bdiff); |
215 |
-+ZEND_FUNCTION(xdiff_string_rabdiff); |
216 |
-+ZEND_FUNCTION(xdiff_file_rabdiff); |
217 |
-+ZEND_FUNCTION(xdiff_file_bdiff_size); |
218 |
-+ZEND_FUNCTION(xdiff_string_bdiff_size); |
219 |
-+ZEND_FUNCTION(xdiff_file_patch); |
220 |
-+ZEND_FUNCTION(xdiff_string_patch); |
221 |
-+ZEND_FUNCTION(xdiff_file_bpatch); |
222 |
-+ZEND_FUNCTION(xdiff_string_bpatch); |
223 |
-+ZEND_FUNCTION(xdiff_file_merge3); |
224 |
-+ZEND_FUNCTION(xdiff_string_merge3); |
225 |
-+ |
226 |
-+ |
227 |
-+static const zend_function_entry ext_functions[] = { |
228 |
-+ ZEND_FE(xdiff_string_diff, arginfo_xdiff_string_diff) |
229 |
-+ ZEND_FE(xdiff_file_diff, arginfo_xdiff_file_diff) |
230 |
-+ ZEND_FALIAS(xdiff_string_diff_binary, xdiff_string_bdiff, arginfo_xdiff_string_diff_binary) |
231 |
-+ ZEND_FALIAS(xdiff_file_diff_binary, xdiff_file_bdiff, arginfo_xdiff_file_diff_binary) |
232 |
-+ ZEND_FE(xdiff_string_rabdiff, arginfo_xdiff_string_rabdiff) |
233 |
-+ ZEND_FE(xdiff_file_rabdiff, arginfo_xdiff_file_rabdiff) |
234 |
-+ ZEND_FE(xdiff_file_bdiff_size, arginfo_xdiff_file_bdiff_size) |
235 |
-+ ZEND_FE(xdiff_string_bdiff_size, arginfo_xdiff_string_bdiff_size) |
236 |
-+ ZEND_FE(xdiff_file_patch, arginfo_xdiff_file_patch) |
237 |
-+ ZEND_FE(xdiff_string_patch, arginfo_xdiff_string_patch) |
238 |
-+ ZEND_FALIAS(xdiff_file_patch_binary, xdiff_file_bpatch, arginfo_xdiff_file_patch_binary) |
239 |
-+ ZEND_FALIAS(xdiff_string_patch_binary, xdiff_string_bpatch, arginfo_xdiff_string_patch_binary) |
240 |
-+ ZEND_FE(xdiff_file_merge3, arginfo_xdiff_file_merge3) |
241 |
-+ ZEND_FE(xdiff_string_merge3, arginfo_xdiff_string_merge3) |
242 |
-+ ZEND_FE_END |
243 |
-+}; |
244 |
--- |
245 |
-2.11.0 |
246 |
- |
247 |
|
248 |
diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch |
249 |
deleted file mode 100644 |
250 |
index e41155467973..000000000000 |
251 |
--- a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch |
252 |
+++ /dev/null |
253 |
@@ -1,39 +0,0 @@ |
254 |
-From 5458ecb8ce81e921239af1a76d6acb54cf945863 Mon Sep 17 00:00:00 2001 |
255 |
-From: Rasmus Lerdorf <rasmus@×××××××.com> |
256 |
-Date: Thu, 14 Jan 2021 15:23:43 -0800 |
257 |
-Subject: [PATCH] Don't need these here |
258 |
- |
259 |
---- |
260 |
- php_xdiff.h | 16 ---------------- |
261 |
- 1 file changed, 16 deletions(-) |
262 |
- |
263 |
-diff --git a/php_xdiff.h b/php_xdiff.h |
264 |
-index de882fa..1b9a699 100644 |
265 |
---- a/php_xdiff.h |
266 |
-+++ b/php_xdiff.h |
267 |
-@@ -39,22 +39,6 @@ extern zend_module_entry xdiff_module_entry; |
268 |
- PHP_MINIT_FUNCTION(xdiff); |
269 |
- PHP_MINFO_FUNCTION(xdiff); |
270 |
- |
271 |
--PHP_FUNCTION(xdiff_file_diff); |
272 |
--PHP_FUNCTION(xdiff_file_bdiff); |
273 |
--PHP_FUNCTION(xdiff_file_patch); |
274 |
--PHP_FUNCTION(xdiff_file_bpatch); |
275 |
--PHP_FUNCTION(xdiff_file_merge3); |
276 |
--PHP_FUNCTION(xdiff_file_rabdiff); |
277 |
--PHP_FUNCTION(xdiff_file_bdiff_size); |
278 |
-- |
279 |
--PHP_FUNCTION(xdiff_string_diff); |
280 |
--PHP_FUNCTION(xdiff_string_bdiff); |
281 |
--PHP_FUNCTION(xdiff_string_patch); |
282 |
--PHP_FUNCTION(xdiff_string_bpatch); |
283 |
--PHP_FUNCTION(xdiff_string_merge3); |
284 |
--PHP_FUNCTION(xdiff_string_rabdiff); |
285 |
--PHP_FUNCTION(xdiff_string_bdiff_size); |
286 |
-- |
287 |
- #endif /* PHP_XDIFF_H */ |
288 |
- |
289 |
- |
290 |
--- |
291 |
-2.11.0 |
292 |
- |
293 |
|
294 |
diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch |
295 |
deleted file mode 100644 |
296 |
index 8a8f3ab43299..000000000000 |
297 |
--- a/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch |
298 |
+++ /dev/null |
299 |
@@ -1,467 +0,0 @@ |
300 |
-From 2afb71ae1d6bcebe66f2e52019222a117c607f66 Mon Sep 17 00:00:00 2001 |
301 |
-From: Rasmus Lerdorf <rasmus@×××××××.com> |
302 |
-Date: Thu, 14 Jan 2021 08:23:43 -0800 |
303 |
-Subject: [PATCH] Version 2.1.0 PHP 8 support Drop PHP 5 support |
304 |
- |
305 |
-diff --git a/php_xdiff.h b/php_xdiff.h |
306 |
-index c79ad63..de882fa 100644 |
307 |
---- a/php_xdiff.h |
308 |
-+++ b/php_xdiff.h |
309 |
-@@ -24,7 +24,7 @@ |
310 |
- extern zend_module_entry xdiff_module_entry; |
311 |
- #define phpext_xdiff_ptr &xdiff_module_entry |
312 |
- |
313 |
--#define PHP_XDIFF_VERSION "2.0.1" |
314 |
-+#define PHP_XDIFF_VERSION "2.1.0" |
315 |
- |
316 |
- #ifdef PHP_WIN32 |
317 |
- #define PHP_XDIFF_API __declspec(dllexport) |
318 |
-diff --git a/xdiff.c b/xdiff.c |
319 |
-index 0756c5a..f4c09f2 100644 |
320 |
---- a/xdiff.c |
321 |
-+++ b/xdiff.c |
322 |
-@@ -27,6 +27,29 @@ |
323 |
- #include "ext/standard/info.h" |
324 |
- #include "php_xdiff.h" |
325 |
- |
326 |
-+#ifndef ZEND_ARG_INFO_WITH_DEFAULT_VALUE |
327 |
-+#define ZEND_ARG_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, default_value) \ |
328 |
-+ ZEND_ARG_INFO(pass_by_ref, name) |
329 |
-+#endif |
330 |
-+#if PHP_VERSION_ID < 70200 |
331 |
-+#undef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX |
332 |
-+#define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ |
333 |
-+ static const zend_internal_arg_info name[] = { \ |
334 |
-+ { (const char*)(zend_uintptr_t)(required_num_args), ( #class_name ), 0, return_reference, allow_null, 0 }, |
335 |
-+#endif |
336 |
-+ |
337 |
-+#ifndef ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX |
338 |
-+#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ |
339 |
-+ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) |
340 |
-+#endif |
341 |
-+ |
342 |
-+#ifndef ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE |
343 |
-+#define ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, type_hint, allow_null, default_value) \ |
344 |
-+ ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) |
345 |
-+#endif |
346 |
-+ |
347 |
-+#include "xdiff_arginfo.h" |
348 |
-+ |
349 |
- #include <xdiff.h> |
350 |
- |
351 |
- /* Not exported by header file */ |
352 |
-@@ -37,14 +60,7 @@ struct string_buffer { |
353 |
- unsigned long size; |
354 |
- }; |
355 |
- |
356 |
-- ZEND_BEGIN_ARG_INFO(xdiff_arg_force_ref, 0) |
357 |
-- ZEND_ARG_PASS_INFO(0) |
358 |
-- ZEND_ARG_PASS_INFO(0) |
359 |
-- ZEND_ARG_PASS_INFO(0) |
360 |
-- ZEND_ARG_PASS_INFO(1) |
361 |
-- ZEND_END_ARG_INFO() |
362 |
-- |
363 |
--static int load_mm_file(const char *filepath, mmfile_t *dest TSRMLS_DC); |
364 |
-+static int load_mm_file(const char *filepath, mmfile_t *dest); |
365 |
- static int load_into_mm_file(const char *buffer, unsigned long size, mmfile_t *dest); |
366 |
- static int append_string(void *ptr, mmbuffer_t *buffer, int array_size); |
367 |
- static int append_stream(void *ptr, mmbuffer_t *buffer, int array_size); |
368 |
-@@ -52,17 +68,17 @@ static int init_string(struct string_buffer *string); |
369 |
- static void free_string(struct string_buffer *string); |
370 |
- static void invalidate_string(struct string_buffer *string); |
371 |
- |
372 |
--static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal TSRMLS_DC); |
373 |
-+static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal); |
374 |
- static int make_diff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output, int context, int minimal); |
375 |
--static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC); |
376 |
-+static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output); |
377 |
- static int make_bdiff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output); |
378 |
--static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags TSRMLS_DC); |
379 |
-+static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags); |
380 |
- static int make_patch_str(char *file, int size1, char *patch, int size2, xdemitcb_t *output, xdemitcb_t *error, int flags); |
381 |
--static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output TSRMLS_DC); |
382 |
-+static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output); |
383 |
- static int make_bpatch_str(char *file, int size1, char *patch, int size2, xdemitcb_t *output); |
384 |
--static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error TSRMLS_DC); |
385 |
-+static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error); |
386 |
- static int make_merge3_str(char *content1, int size1, char *content2, int size2, char *content3, int size3, xdemitcb_t *output, xdemitcb_t *error); |
387 |
--static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC); |
388 |
-+static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output); |
389 |
- static int make_rabdiff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output); |
390 |
- |
391 |
- static void *xdiff_malloc(void *foo, unsigned int size) |
392 |
-@@ -84,33 +100,6 @@ static void *xdiff_realloc(void *foo, void *ptr, unsigned int nsize) |
393 |
- |
394 |
- static memallocator_t allocator = { NULL, xdiff_malloc, xdiff_free, xdiff_realloc }; |
395 |
- |
396 |
--/* {{{ xdiff_functions[] |
397 |
-- * |
398 |
-- * Every user visible function must have an entry in xdiff_functions[]. |
399 |
-- */ |
400 |
--zend_function_entry xdiff_functions[] = { |
401 |
-- PHP_FE(xdiff_file_diff, NULL) |
402 |
-- PHP_FE(xdiff_file_bdiff, NULL) |
403 |
-- PHP_FE(xdiff_file_patch, NULL) |
404 |
-- PHP_FE(xdiff_file_bpatch, NULL) |
405 |
-- PHP_FE(xdiff_file_merge3, NULL) |
406 |
-- PHP_FE(xdiff_file_rabdiff, NULL) |
407 |
-- PHP_FE(xdiff_file_bdiff_size, NULL) |
408 |
-- PHP_FE(xdiff_string_diff, NULL) |
409 |
-- PHP_FE(xdiff_string_bdiff, NULL) |
410 |
-- PHP_FE(xdiff_string_patch, xdiff_arg_force_ref) |
411 |
-- PHP_FE(xdiff_string_bpatch, NULL) |
412 |
-- PHP_FE(xdiff_string_merge3, xdiff_arg_force_ref) |
413 |
-- PHP_FE(xdiff_string_rabdiff, NULL) |
414 |
-- PHP_FE(xdiff_string_bdiff_size, NULL) |
415 |
-- PHP_FALIAS(xdiff_file_diff_binary, xdiff_file_bdiff, NULL) |
416 |
-- PHP_FALIAS(xdiff_file_patch_binary, xdiff_file_bpatch, NULL) |
417 |
-- PHP_FALIAS(xdiff_string_diff_binary, xdiff_string_bdiff, NULL) |
418 |
-- PHP_FALIAS(xdiff_string_patch_binary, xdiff_string_bpatch, NULL) |
419 |
-- {NULL, NULL, NULL} |
420 |
--}; |
421 |
--/* }}} */ |
422 |
-- |
423 |
- /* {{{ xdiff_module_entry |
424 |
- */ |
425 |
- zend_module_entry xdiff_module_entry = { |
426 |
-@@ -118,7 +107,7 @@ zend_module_entry xdiff_module_entry = { |
427 |
- STANDARD_MODULE_HEADER, |
428 |
- #endif |
429 |
- "xdiff", |
430 |
-- xdiff_functions, |
431 |
-+ ext_functions, |
432 |
- PHP_MINIT(xdiff), |
433 |
- NULL, |
434 |
- NULL, |
435 |
-@@ -172,7 +161,7 @@ PHP_FUNCTION(xdiff_string_diff) |
436 |
- xdemitcb_t output; |
437 |
- struct string_buffer string; |
438 |
- |
439 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|lb", &str1, &str2, &context, &minimal) == FAILURE) { |
440 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS|lb", &str1, &str2, &context, &minimal) == FAILURE) { |
441 |
- RETURN_FALSE; |
442 |
- } |
443 |
- |
444 |
-@@ -204,7 +193,7 @@ PHP_FUNCTION(xdiff_file_diff) |
445 |
- xdemitcb_t output; |
446 |
- php_stream *output_stream; |
447 |
- |
448 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS|lb", &filepath1, &filepath2, &dest, &context, &minimal) == FAILURE) { |
449 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS|lb", &filepath1, &filepath2, &dest, &context, &minimal) == FAILURE) { |
450 |
- RETURN_FALSE; |
451 |
- } |
452 |
- |
453 |
-@@ -217,7 +206,7 @@ PHP_FUNCTION(xdiff_file_diff) |
454 |
- output.priv = output_stream; |
455 |
- output.outf = append_stream; |
456 |
- |
457 |
-- retval = make_diff(filepath1->val, filepath2->val, &output, context, minimal TSRMLS_CC); |
458 |
-+ retval = make_diff(filepath1->val, filepath2->val, &output, context, minimal); |
459 |
- if (!retval) |
460 |
- goto out_stream_close; |
461 |
- |
462 |
-@@ -239,7 +228,7 @@ PHP_FUNCTION(xdiff_string_bdiff) |
463 |
- xdemitcb_t output; |
464 |
- struct string_buffer string; |
465 |
- |
466 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &str1, &str2) == FAILURE) { |
467 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &str1, &str2) == FAILURE) { |
468 |
- RETURN_FALSE; |
469 |
- } |
470 |
- |
471 |
-@@ -270,7 +259,7 @@ PHP_FUNCTION(xdiff_file_bdiff) |
472 |
- xdemitcb_t output; |
473 |
- php_stream *output_stream; |
474 |
- |
475 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &filepath1, &filepath2, &result) == FAILURE) { |
476 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &filepath1, &filepath2, &result) == FAILURE) { |
477 |
- RETURN_FALSE; |
478 |
- } |
479 |
- |
480 |
-@@ -283,7 +272,7 @@ PHP_FUNCTION(xdiff_file_bdiff) |
481 |
- output.priv = output_stream; |
482 |
- output.outf = append_stream; |
483 |
- |
484 |
-- retval = make_bdiff(filepath1->val, filepath2->val, &output TSRMLS_CC); |
485 |
-+ retval = make_bdiff(filepath1->val, filepath2->val, &output); |
486 |
- if (!retval) |
487 |
- goto out_stream_close; |
488 |
- |
489 |
-@@ -305,7 +294,7 @@ PHP_FUNCTION(xdiff_string_rabdiff) |
490 |
- xdemitcb_t output; |
491 |
- struct string_buffer string; |
492 |
- |
493 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &str1, &str2) == FAILURE) { |
494 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &str1, &str2) == FAILURE) { |
495 |
- RETURN_FALSE; |
496 |
- } |
497 |
- |
498 |
-@@ -336,7 +325,7 @@ PHP_FUNCTION(xdiff_file_rabdiff) |
499 |
- xdemitcb_t output; |
500 |
- php_stream *output_stream; |
501 |
- |
502 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &filepath1, &filepath2, &result) == FAILURE) { |
503 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &filepath1, &filepath2, &result) == FAILURE) { |
504 |
- RETURN_FALSE; |
505 |
- } |
506 |
- |
507 |
-@@ -349,7 +338,7 @@ PHP_FUNCTION(xdiff_file_rabdiff) |
508 |
- output.priv = output_stream; |
509 |
- output.outf = append_stream; |
510 |
- |
511 |
-- retval = make_rabdiff(filepath1->val, filepath2->val, &output TSRMLS_CC); |
512 |
-+ retval = make_rabdiff(filepath1->val, filepath2->val, &output); |
513 |
- if (!retval) |
514 |
- goto out_stream_close; |
515 |
- |
516 |
-@@ -371,13 +360,13 @@ PHP_FUNCTION(xdiff_file_bdiff_size) |
517 |
- long result; |
518 |
- mmfile_t file; |
519 |
- |
520 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &filepath) == FAILURE) { |
521 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &filepath) == FAILURE) { |
522 |
- RETURN_FALSE; |
523 |
- } |
524 |
- |
525 |
- RETVAL_FALSE; |
526 |
- |
527 |
-- retval = load_mm_file(filepath->val, &file TSRMLS_CC); |
528 |
-+ retval = load_mm_file(filepath->val, &file); |
529 |
- if (!retval) |
530 |
- goto out; |
531 |
- |
532 |
-@@ -403,7 +392,7 @@ PHP_FUNCTION(xdiff_string_bdiff_size) |
533 |
- long result; |
534 |
- mmfile_t file; |
535 |
- |
536 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &patch) == FAILURE) { |
537 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &patch) == FAILURE) { |
538 |
- RETURN_FALSE; |
539 |
- } |
540 |
- |
541 |
-@@ -437,7 +426,7 @@ PHP_FUNCTION(xdiff_file_patch) |
542 |
- xdemitcb_t output, error_output; |
543 |
- struct string_buffer error_string; |
544 |
- |
545 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS|l", &src_path, &patch_path, &dest_path, &flags) == FAILURE) { |
546 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS|l", &src_path, &patch_path, &dest_path, &flags) == FAILURE) { |
547 |
- RETURN_FALSE; |
548 |
- } |
549 |
- |
550 |
-@@ -457,7 +446,7 @@ PHP_FUNCTION(xdiff_file_patch) |
551 |
- error_output.priv= &error_string; |
552 |
- error_output.outf = append_string; |
553 |
- |
554 |
-- retval = make_patch(src_path->val, patch_path->val, &output, &error_output, flags TSRMLS_CC); |
555 |
-+ retval = make_patch(src_path->val, patch_path->val, &output, &error_output, flags); |
556 |
- if (retval < 0) |
557 |
- goto out_free_string; |
558 |
- |
559 |
-@@ -487,7 +476,7 @@ PHP_FUNCTION(xdiff_string_patch) |
560 |
- xdemitcb_t output, error_output; |
561 |
- struct string_buffer output_string, error_string; |
562 |
- |
563 |
-- if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS() TSRMLS_CC, "SS|lz", &src, &patch, &flags, &error_ref) == FAILURE) { |
564 |
-+ if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS(), "SS|lz", &src, &patch, &flags, &error_ref) == FAILURE) { |
565 |
- RETURN_FALSE; |
566 |
- } |
567 |
- |
568 |
-@@ -539,7 +528,7 @@ PHP_FUNCTION(xdiff_file_bpatch) |
569 |
- int retval; |
570 |
- xdemitcb_t output; |
571 |
- |
572 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &src_path, &patch_path, &dest_path) == FAILURE) { |
573 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &src_path, &patch_path, &dest_path) == FAILURE) { |
574 |
- RETURN_FALSE; |
575 |
- } |
576 |
- |
577 |
-@@ -552,7 +541,7 @@ PHP_FUNCTION(xdiff_file_bpatch) |
578 |
- output.outf = append_stream; |
579 |
- output.priv = output_stream; |
580 |
- |
581 |
-- retval = make_bpatch(src_path->val, patch_path->val, &output TSRMLS_CC); |
582 |
-+ retval = make_bpatch(src_path->val, patch_path->val, &output); |
583 |
- php_stream_close(output_stream); |
584 |
- |
585 |
- if (retval == 0) |
586 |
-@@ -572,7 +561,7 @@ PHP_FUNCTION(xdiff_string_bpatch) |
587 |
- xdemitcb_t output; |
588 |
- struct string_buffer output_string; |
589 |
- |
590 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &src, &patch) == FAILURE) { |
591 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &src, &patch) == FAILURE) { |
592 |
- RETURN_FALSE; |
593 |
- } |
594 |
- |
595 |
-@@ -608,7 +597,7 @@ PHP_FUNCTION(xdiff_file_merge3) |
596 |
- xdemitcb_t output, error_output; |
597 |
- int retval; |
598 |
- |
599 |
-- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSSS", &file1, &file2, &file3, &dest) == FAILURE) { |
600 |
-+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSSS", &file1, &file2, &file3, &dest) == FAILURE) { |
601 |
- RETURN_FALSE; |
602 |
- } |
603 |
- |
604 |
-@@ -628,7 +617,7 @@ PHP_FUNCTION(xdiff_file_merge3) |
605 |
- error_output.priv = &string; |
606 |
- error_output.outf = append_string; |
607 |
- |
608 |
-- retval = make_merge3(file1->val, file2->val, file3->val, &output, &error_output TSRMLS_CC); |
609 |
-+ retval = make_merge3(file1->val, file2->val, file3->val, &output, &error_output); |
610 |
- if (!retval) |
611 |
- goto out_free_string; |
612 |
- |
613 |
-@@ -657,7 +646,7 @@ PHP_FUNCTION(xdiff_string_merge3) |
614 |
- xdemitcb_t output, error_output; |
615 |
- int retval; |
616 |
- |
617 |
-- if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS() TSRMLS_CC, "SSS|z", &file1, &file2, &file3, &error_ref) == FAILURE) { |
618 |
-+ if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS(), "SSS|z", &file1, &file2, &file3, &error_ref) == FAILURE) { |
619 |
- RETURN_FALSE; |
620 |
- } |
621 |
- |
622 |
-@@ -700,7 +689,7 @@ out: |
623 |
- } |
624 |
- /* }}} */ |
625 |
- |
626 |
--static int load_mm_file(const char *filepath, mmfile_t *dest TSRMLS_DC) |
627 |
-+static int load_mm_file(const char *filepath, mmfile_t *dest) |
628 |
- { |
629 |
- int retval; |
630 |
- off_t filesize; |
631 |
-@@ -789,7 +778,6 @@ static int append_stream(void *ptr, mmbuffer_t *buffer, int array_size) |
632 |
- { |
633 |
- php_stream *stream = ptr; |
634 |
- unsigned int i; |
635 |
-- TSRMLS_FETCH(); |
636 |
- |
637 |
- for (i = 0; i < array_size; i++) { |
638 |
- php_stream_write(stream, buffer[i].ptr, buffer[i].size); |
639 |
-@@ -821,18 +809,18 @@ static void free_string(struct string_buffer *string) |
640 |
- efree(string->ptr); |
641 |
- } |
642 |
- |
643 |
--static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal TSRMLS_DC) |
644 |
-+static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal) |
645 |
- { |
646 |
- mmfile_t file1, file2; |
647 |
- xpparam_t params; |
648 |
- xdemitconf_t conf; |
649 |
- int retval, result = 0; |
650 |
- |
651 |
-- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); |
652 |
-+ retval = load_mm_file(filepath1, &file1); |
653 |
- if (!retval) |
654 |
- goto out; |
655 |
- |
656 |
-- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); |
657 |
-+ retval = load_mm_file(filepath2, &file2); |
658 |
- if (!retval) |
659 |
- goto out_free_mmfile; |
660 |
- |
661 |
-@@ -885,17 +873,17 @@ out: |
662 |
- return result; |
663 |
- } |
664 |
- |
665 |
--static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC) |
666 |
-+static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output) |
667 |
- { |
668 |
- mmfile_t file1, file2; |
669 |
- bdiffparam_t params; |
670 |
- int retval, result = 0; |
671 |
- |
672 |
-- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); |
673 |
-+ retval = load_mm_file(filepath1, &file1); |
674 |
- if (!retval) |
675 |
- goto out; |
676 |
- |
677 |
-- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); |
678 |
-+ retval = load_mm_file(filepath2, &file2); |
679 |
- if (!retval) |
680 |
- goto out_free_mmfile; |
681 |
- |
682 |
-@@ -945,16 +933,16 @@ out: |
683 |
- return result; |
684 |
- } |
685 |
- |
686 |
--static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC) |
687 |
-+static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output) |
688 |
- { |
689 |
- mmfile_t file1, file2; |
690 |
- int retval, result = 0; |
691 |
- |
692 |
-- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); |
693 |
-+ retval = load_mm_file(filepath1, &file1); |
694 |
- if (!retval) |
695 |
- goto out; |
696 |
- |
697 |
-- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); |
698 |
-+ retval = load_mm_file(filepath2, &file2); |
699 |
- if (!retval) |
700 |
- goto out_free_mmfile; |
701 |
- |
702 |
-@@ -999,16 +987,16 @@ out: |
703 |
- return result; |
704 |
- } |
705 |
- |
706 |
--static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags TSRMLS_DC) |
707 |
-+static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags) |
708 |
- { |
709 |
- mmfile_t file, patch; |
710 |
- int retval, result = 0; |
711 |
- |
712 |
-- retval = load_mm_file(file_path, &file TSRMLS_CC); |
713 |
-+ retval = load_mm_file(file_path, &file); |
714 |
- if (!retval) |
715 |
- goto out; |
716 |
- |
717 |
-- retval = load_mm_file(patch_path, &patch TSRMLS_CC); |
718 |
-+ retval = load_mm_file(patch_path, &patch); |
719 |
- if (!retval) |
720 |
- goto out_free_mmfile; |
721 |
- |
722 |
-@@ -1053,16 +1041,16 @@ out: |
723 |
- return result; |
724 |
- } |
725 |
- |
726 |
--static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output TSRMLS_DC) |
727 |
-+static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output) |
728 |
- { |
729 |
- mmfile_t file_mm, patch_mm; |
730 |
- int retval, result = 0; |
731 |
- |
732 |
-- retval = load_mm_file(file_path, &file_mm TSRMLS_CC); |
733 |
-+ retval = load_mm_file(file_path, &file_mm); |
734 |
- if (!retval) |
735 |
- goto out; |
736 |
- |
737 |
-- retval = load_mm_file(patch_path, &patch_mm TSRMLS_CC); |
738 |
-+ retval = load_mm_file(patch_path, &patch_mm); |
739 |
- if (!retval) |
740 |
- goto out_free_mmfile; |
741 |
- |
742 |
-@@ -1107,20 +1095,20 @@ out: |
743 |
- return result; |
744 |
- } |
745 |
- |
746 |
--static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error TSRMLS_DC) |
747 |
-+static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error) |
748 |
- { |
749 |
- mmfile_t file1, file2, file3; |
750 |
- int retval, result = 0; |
751 |
- |
752 |
-- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); |
753 |
-+ retval = load_mm_file(filepath1, &file1); |
754 |
- if (!retval) |
755 |
- goto out; |
756 |
- |
757 |
-- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); |
758 |
-+ retval = load_mm_file(filepath2, &file2); |
759 |
- if (!retval) |
760 |
- goto out_free_mmfile; |
761 |
- |
762 |
-- retval = load_mm_file(filepath3, &file3 TSRMLS_CC); |
763 |
-+ retval = load_mm_file(filepath3, &file3); |
764 |
- if (!retval) |
765 |
- goto out_free_mmfile2; |
766 |
- |
767 |
|
768 |
diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild |
769 |
deleted file mode 100644 |
770 |
index 336f7f480f72..000000000000 |
771 |
--- a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild |
772 |
+++ /dev/null |
773 |
@@ -1,30 +0,0 @@ |
774 |
-# Copyright 1999-2021 Gentoo Authors |
775 |
-# Distributed under the terms of the GNU General Public License v2 |
776 |
- |
777 |
-EAPI=7 |
778 |
- |
779 |
-PHP_EXT_NAME="xdiff" |
780 |
-PHP_EXT_PECL_PKG="xdiff" |
781 |
-DOCS=( README.API ) |
782 |
- |
783 |
-USE_PHP="php7-3 php7-4 php8-0" |
784 |
-PHP_EXT_PECL_FILENAME="${PN/pecl-/}-2.0.1.tgz" |
785 |
- |
786 |
-inherit php-ext-pecl-r3 |
787 |
- |
788 |
-KEYWORDS="~amd64 ~x86" |
789 |
- |
790 |
-DESCRIPTION="PHP extension for generating diff files" |
791 |
-LICENSE="PHP-3.01" |
792 |
-SLOT="7" |
793 |
- |
794 |
-DEPEND="dev-libs/libxdiff" |
795 |
-RDEPEND="${DEPEND}" |
796 |
-PHP_EXT_ECONF_ARGS=() |
797 |
-PATCHES=( |
798 |
-"${FILESDIR}/2.1.0_pre-php8.patch" |
799 |
-"${FILESDIR}/2.1.0_pre-php8-2.patch" |
800 |
-"${FILESDIR}/2.1.0_pre-php8-3.patch" |
801 |
-) |
802 |
-S="${WORKDIR}/${PHP_EXT_PECL_FILENAME/.tgz/}" |
803 |
-PHP_EXT_S="${S}" |