ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Compress-LZF/LZF.xs
(Generate patch)

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.20 by root, Fri Jul 7 15:47:10 2006 UTC vs.
Revision 1.34 by root, Mon Jun 29 23:51:28 2015 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5/* try to be compatible with older perls */ 5#include "perlmulticore.h"
6/* SvPV_nolen() macro first defined in 5.005_55 */ 6
7/* this is slow, not threadsafe, but works */ 7#define LZF_STANDALONE 1
8#include "patchlevel.h" 8#define LZF_STATE_ARG 1
9#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55))
10static STRLEN nolen_na;
11# define SvPV_nolen(sv) SvPV ((sv), nolen_na)
12#endif
13#if PATCHLEVEL < 6
14# define call_sv perl_call_sv
15#endif
16 9
17#include "lzf_c.c" 10#include "lzf_c.c"
18#include "lzf_d.c" 11#include "lzf_d.c"
12#include "lzf_c_best.c"
19 13
20/* we re-use the storable header for our purposes */ 14/* we re-use the storable header for our purposes */
21#define MAGIC_LO 0 15#define MAGIC_LO 0
22#define MAGIC_U 0 /* uncompressed data follows */ 16#define MAGIC_U 0 /* uncompressed data follows */
23#define MAGIC_C 1 /* compressed data follows */ 17#define MAGIC_C 1 /* compressed data follows */
39#else 33#else
40# define MAX_LENGTH ((Size_t) 0x8000000L) 34# define MAX_LENGTH ((Size_t) 0x8000000L)
41#endif 35#endif
42 36
43static SV * 37static SV *
44compress_sv (SV *data, char cprepend, int uprepend) 38compress_sv (SV *data, char cprepend, int uprepend, int best)
45{ 39{
40 void *state;
46 STRLEN usize, csize; 41 STRLEN usize, csize;
47 char *src = (char *)SvPV (data, usize); 42 char *src = (char *)SvPVbyte (data, usize);
48 43
49 if (usize) 44 if (usize)
50 { 45 {
51 SV *ret = NEWSV (0, usize + 1); 46 SV *ret = NEWSV (0, usize + 1);
52 unsigned char *dst; 47 unsigned char *dst;
60 55
61 if (usize <= 0x7f) 56 if (usize <= 0x7f)
62 { 57 {
63 dst[skip++] = usize; 58 dst[skip++] = usize;
64 } 59 }
65 else if (usize <= 0x7ff) 60 else if (usize <= 0x7ff)
66 { 61 {
67 dst[skip++] = (( usize >> 6) | 0xc0); 62 dst[skip++] = (( usize >> 6) | 0xc0);
68 dst[skip++] = (( usize & 0x3f) | 0x80); 63 dst[skip++] = (( usize & 0x3f) | 0x80);
69 } 64 }
70 else if (usize <= 0xffff) 65 else if (usize <= 0xffff)
71 { 66 {
72 dst[skip++] = (( usize >> 12) | 0xe0); 67 dst[skip++] = (( usize >> 12) | 0xe0);
73 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 68 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
74 dst[skip++] = (( usize & 0x3f) | 0x80); 69 dst[skip++] = (( usize & 0x3f) | 0x80);
75 } 70 }
76 else if (usize <= 0x1fffff) 71 else if (usize <= 0x1fffff)
77 { 72 {
78 dst[skip++] = (( usize >> 18) | 0xf0); 73 dst[skip++] = (( usize >> 18) | 0xf0);
79 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 74 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
80 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 75 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
81 dst[skip++] = (( usize & 0x3f) | 0x80); 76 dst[skip++] = (( usize & 0x3f) | 0x80);
82 } 77 }
83 else if (usize <= 0x3ffffff) 78 else if (usize <= 0x3ffffff)
84 { 79 {
85 dst[skip++] = (( usize >> 24) | 0xf8); 80 dst[skip++] = (( usize >> 24) | 0xf8);
86 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 81 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
87 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 82 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
88 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80); 83 dst[skip++] = (((usize >> 6) & 0x3f) | 0x80);
89 dst[skip++] = (( usize & 0x3f) | 0x80); 84 dst[skip++] = (( usize & 0x3f) | 0x80);
90 } 85 }
91 else if (usize <= 0x7fffffff) 86 else if (usize <= 0x7fffffff)
92 { 87 {
93 dst[skip++] = (( usize >> 30) | 0xfc); 88 dst[skip++] = (( usize >> 30) | 0xfc);
94 dst[skip++] = (((usize >> 24) & 0x3f) | 0x80); 89 dst[skip++] = (((usize >> 24) & 0x3f) | 0x80);
95 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80); 90 dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
96 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80); 91 dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
98 dst[skip++] = (( usize & 0x3f) | 0x80); 93 dst[skip++] = (( usize & 0x3f) | 0x80);
99 } 94 }
100 else 95 else
101 croak ("compress can only compress up to %ld bytes", 0x7fffffffL); 96 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
102 97
98 if (usize > 2000) perlinterp_release ();
99
100 state = malloc (best ? sizeof (LZF_STATE_BEST) : sizeof (LZF_STATE));
101 if (!state)
102 {
103 if (usize > 2000) perlinterp_acquire ();
104 croak ("Compress::LZF unable to allocate memory for compression state");
105 }
106
103 /* 11 bytes is the smallest compressible string */ 107 /* 11 bytes is the smallest compressible string */
104 csize = usize < 11 ? 0 : 108 csize = usize < 11 ? 0 :
105 lzf_compress (src, usize, 109 (best ? lzf_compress_best (src, usize, dst + skip, usize - skip, *(LZF_STATE_BEST *)state)
106 dst + skip, 110 : lzf_compress (src, usize, dst + skip, usize - skip, *(LZF_STATE *)state));
107 usize - skip); 111
112 free (state);
113
114 if (usize > 2000) perlinterp_acquire ();
108 115
109 if (csize) 116 if (csize)
110 { 117 {
111 SvCUR_set (ret, csize + skip); 118 SvCUR_set (ret, csize + skip);
112 } 119 }
132 139
133static SV * 140static SV *
134decompress_sv (SV *data, int skip) 141decompress_sv (SV *data, int skip)
135{ 142{
136 STRLEN usize, csize; 143 STRLEN usize, csize;
137 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 144 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
138 145
139 if (csize) 146 if (csize)
140 { 147 {
141 void *dst; 148 void *dst;
142 SV *ret; 149 SV *ret;
150 int res;
143 151
144 csize -= skip; 152 csize -= skip;
145 153
146 if (src[0]) 154 if (src[0])
147 { 155 {
148 if (!(src[0] & 0x80)) 156 if (!(src[0] & 0x80) && csize >= 1)
149 { 157 {
150 csize -= 1; 158 csize -= 1;
151 usize = *src++ & 0xff; 159 usize = *src++ & 0xff;
152 } 160 }
153 else if (!(src[0] & 0x20)) 161 else if (!(src[0] & 0x20) && csize >= 2)
154 { 162 {
155 csize -= 2; 163 csize -= 2;
156 usize = *src++ & 0x1f; 164 usize = *src++ & 0x1f;
157 usize = (usize << 6) | (*src++ & 0x3f); 165 usize = (usize << 6) | (*src++ & 0x3f);
158 } 166 }
159 else if (!(src[0] & 0x10)) 167 else if (!(src[0] & 0x10) && csize >= 3)
160 { 168 {
161 csize -= 3; 169 csize -= 3;
162 usize = *src++ & 0x0f; 170 usize = *src++ & 0x0f;
163 usize = (usize << 6) | (*src++ & 0x3f); 171 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 172 usize = (usize << 6) | (*src++ & 0x3f);
165 } 173 }
166 else if (!(src[0] & 0x08)) 174 else if (!(src[0] & 0x08) && csize >= 4)
167 { 175 {
168 csize -= 4; 176 csize -= 4;
169 usize = *src++ & 0x07; 177 usize = *src++ & 0x07;
170 usize = (usize << 6) | (*src++ & 0x3f); 178 usize = (usize << 6) | (*src++ & 0x3f);
171 usize = (usize << 6) | (*src++ & 0x3f); 179 usize = (usize << 6) | (*src++ & 0x3f);
172 usize = (usize << 6) | (*src++ & 0x3f); 180 usize = (usize << 6) | (*src++ & 0x3f);
173 } 181 }
174 else if (!(src[0] & 0x04)) 182 else if (!(src[0] & 0x04) && csize >= 5)
175 { 183 {
176 csize -= 5; 184 csize -= 5;
177 usize = *src++ & 0x03; 185 usize = *src++ & 0x03;
178 usize = (usize << 6) | (*src++ & 0x3f); 186 usize = (usize << 6) | (*src++ & 0x3f);
179 usize = (usize << 6) | (*src++ & 0x3f); 187 usize = (usize << 6) | (*src++ & 0x3f);
180 usize = (usize << 6) | (*src++ & 0x3f); 188 usize = (usize << 6) | (*src++ & 0x3f);
181 usize = (usize << 6) | (*src++ & 0x3f); 189 usize = (usize << 6) | (*src++ & 0x3f);
182 } 190 }
183 else if (!(src[0] & 0x02)) 191 else if (!(src[0] & 0x02) && csize >= 6)
184 { 192 {
185 csize -= 6; 193 csize -= 6;
186 usize = *src++ & 0x01; 194 usize = *src++ & 0x01;
187 usize = (usize << 6) | (*src++ & 0x3f); 195 usize = (usize << 6) | (*src++ & 0x3f);
188 usize = (usize << 6) | (*src++ & 0x3f); 196 usize = (usize << 6) | (*src++ & 0x3f);
190 usize = (usize << 6) | (*src++ & 0x3f); 198 usize = (usize << 6) | (*src++ & 0x3f);
191 usize = (usize << 6) | (*src++ & 0x3f); 199 usize = (usize << 6) | (*src++ & 0x3f);
192 } 200 }
193 else 201 else
194 croak ("compressed data corrupted (invalid length)"); 202 croak ("compressed data corrupted (invalid length)");
195 203
204 if (!usize)
205 croak ("compressed data corrupted (invalid length)");
206
196 ret = NEWSV (0, usize); 207 ret = NEWSV (0, usize);
197 SvPOK_only (ret); 208 SvPOK_only (ret);
198 dst = SvPVX (ret); 209 dst = SvPVX (ret);
199 210
211 if (usize > 4000) perlinterp_release ();
200 if (lzf_decompress (src, csize, dst, usize) != usize) 212 res = lzf_decompress (src, csize, dst, usize) != usize;
213 if (usize > 4000) perlinterp_acquire ();
214
215 if (res)
216 {
217 SvREFCNT_dec (ret);
201 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 218 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
219 }
202 } 220 }
203 else 221 else
204 { 222 {
205 usize = csize - 1; 223 usize = csize - 1;
206 ret = NEWSV (0, usize); 224 ret = NEWSV (0, usize | 1);
207 SvPOK_only (ret); 225 SvPOK_only (ret);
208 226
209 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 227 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
210 } 228 }
211 229
216 else 234 else
217 return newSVpvn ("", 0); 235 return newSVpvn ("", 0);
218} 236}
219 237
220static void 238static void
221need_storable(void) 239need_storable (void)
222{ 240{
223#if PATCHLEVEL < 6 241 eval_sv (sv_2mortal (newSVpvf ("require %s", SvPVbyte_nolen (serializer_package))), G_VOID | G_DISCARD);
224 char req[8192];
225 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
226 perl_eval_pv (req, 1);
227#else
228 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
229#endif
230 242
231 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV)); 243 storable_mstore = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mstore ), TRUE, SVt_PVCV)));
232 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV)); 244 storable_mretrieve = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV)));
233} 245}
234 246
235MODULE = Compress::LZF PACKAGE = Compress::LZF 247MODULE = Compress::LZF PACKAGE = Compress::LZF
236 248
237BOOT: 249BOOT:
247 PROTOTYPE: $$$ 259 PROTOTYPE: $$$
248 PPCODE: 260 PPCODE:
249 SvSetSV (serializer_package , package ); 261 SvSetSV (serializer_package , package );
250 SvSetSV (serializer_mstore , mstore ); 262 SvSetSV (serializer_mstore , mstore );
251 SvSetSV (serializer_mretrieve, mretrieve); 263 SvSetSV (serializer_mretrieve, mretrieve);
252 storable_mstore = 264 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
253 storable_mretrieve = 0; 265 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
254 266
255void 267void
256compress(data) 268compress(data)
257 SV * data 269 SV * data
270 ALIAS:
271 compress_best = 1
258 PROTOTYPE: $ 272 PROTOTYPE: $
259 PPCODE: 273 PPCODE:
260 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U))); 274 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U, ix)));
261 275
262void 276void
263decompress(data) 277decompress(data)
264 SV * data 278 SV * data
265 PROTOTYPE: $ 279 PROTOTYPE: $
268 282
269void 283void
270sfreeze(sv) 284sfreeze(sv)
271 SV * sv 285 SV * sv
272 ALIAS: 286 ALIAS:
287 sfreeze = 0
273 sfreeze_cr = 1 288 sfreeze_cr = 1
274 sfreeze_c = 2 289 sfreeze_c = 2
290 sfreeze_best = 4
291 sfreeze_cr_best = 5
292 sfreeze_c_best = 6
275 PROTOTYPE: $ 293 PROTOTYPE: $
276 PPCODE: 294 PPCODE:
295{
296 int best = ix & 4;
297 ix &= 3;
277 298
278 SvGETMAGIC (sv); 299 SvGETMAGIC (sv);
279 300
280 if (!SvOK (sv)) 301 if (!SvOK (sv))
281 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 302 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
282 else if (SvROK (sv) 303 else if (SvROK (sv)
304 || SvUTF8 (sv)
283 || (SvTYPE(sv) != SVt_IV 305 || (SvTYPE(sv) != SVt_IV
284 && SvTYPE(sv) != SVt_NV 306 && SvTYPE(sv) != SVt_NV
285 && SvTYPE(sv) != SVt_PV 307 && SvTYPE(sv) != SVt_PV
286 && SvTYPE(sv) != SVt_PVIV 308 && SvTYPE(sv) != SVt_PVIV
287 && SvTYPE(sv) != SVt_PVNV 309 && SvTYPE(sv) != SVt_PVNV
288 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 310 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
289 { 311 {
290 int deref = !SvROK (sv); 312 int deref = !SvROK (sv);
313 char *pv;
291 314
292 if (!storable_mstore) 315 if (!storable_mstore)
316 {
317 PUTBACK;
293 need_storable (); 318 need_storable ();
319 SPAGAIN;
320 }
294 321
295 if (deref) 322 if (deref)
296 sv = newRV_noinc (sv); 323 sv = newRV_noinc (sv);
297 324
298 PUSHMARK (SP); 325 PUSHMARK (SP);
299 XPUSHs (sv); 326 XPUSHs (sv);
300 PUTBACK; 327 PUTBACK;
301 328
302 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 329 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
303 croak ("Storable::mstore didn't return a single scalar"); 330 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
304 331
305 SPAGAIN; 332 SPAGAIN;
306 333
307 sv = POPs; 334 sv = POPs;
335 pv = SvPV_nolen (sv);
308 336
309 if (SvPVX (sv)[0] == MAGIC_R) 337 if (*pv == MAGIC_R)
310 { 338 {
311 if (deref) 339 if (deref)
312 SvPVX (sv)[0] = MAGIC_R_deref; 340 *pv = MAGIC_R_deref;
313 } 341 }
314 else 342 else
315 { 343 {
316 char pfx[2]; 344 char pfx[2];
317 345
320 348
321 sv_insert (sv, 0, 0, pfx, 2); 349 sv_insert (sv, 0, 0, pfx, 2);
322 } 350 }
323 351
324 if (ix) /* compress */ 352 if (ix) /* compress */
325 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 353 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1, best));
326 354
327 XPUSHs (sv); 355 XPUSHs (sv);
328 } 356 }
329 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 357 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
330 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */ 358 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U, best))); /* need to prefix only */
331 else if (ix == 2) /* compress always */ 359 else if (ix == 2) /* compress always */
332 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 360 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1, best)));
333 else if (SvNIOK (sv)) /* don't compress */ 361 else if (SvNIOK (sv)) /* don't compress */
334 { 362 {
335 STRLEN len; 363 STRLEN len;
336 char *s = SvPV (sv, len); 364 char *s = SvPV (sv, len);
337 XPUSHs (sv_2mortal (newSVpvn (s, len))); 365 XPUSHs (sv_2mortal (newSVpvn (s, len)));
338 } 366 }
339 else /* don't compress */ 367 else /* don't compress */
340 XPUSHs (sv_2mortal (newSVsv (sv))); 368 XPUSHs (sv_2mortal (newSVsv (sv)));
369}
341 370
342void 371void
343sthaw(sv) 372sthaw(sv)
344 SV * sv 373 SV * sv
345 PROTOTYPE: $ 374 PROTOTYPE: $
347{ 376{
348 STRLEN svlen; 377 STRLEN svlen;
349 int deref = 0; 378 int deref = 0;
350 379
351 SvGETMAGIC (sv); 380 SvGETMAGIC (sv);
352 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI)) 381 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
353 { 382 {
354 redo: 383 redo:
355 384
356 switch (SvPVX (sv)[0]) 385 switch (SvPVX (sv)[0])
357 { 386 {
366 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 395 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
367 396
368 sv_chop (sv, SvPVX (sv) + 2); 397 sv_chop (sv, SvPVX (sv) + 2);
369 398
370 if (!storable_mstore) 399 if (!storable_mstore)
400 {
401 PUTBACK;
371 need_storable (); 402 need_storable ();
403 SPAGAIN;
404 }
372 405
373 PUSHMARK (SP); 406 PUSHMARK (SP);
374 XPUSHs (sv); 407 XPUSHs (sv);
375 PUTBACK; 408 PUTBACK;
376 409
377 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 410 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
378 croak ("Storable::mstore didn't return a single scalar"); 411 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
379 412
380 SPAGAIN; 413 SPAGAIN;
381 414
382 if (deref) 415 if (deref)
383 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs)))); 416 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
410 goto redo; 443 goto redo;
411 444
412 case MAGIC_R: 445 case MAGIC_R:
413 handle_MAGIC_R: 446 handle_MAGIC_R:
414 if (!storable_mstore) 447 if (!storable_mstore)
448 {
449 PUTBACK;
415 need_storable (); 450 need_storable ();
451 SPAGAIN;
452 }
416 453
417 PUSHMARK (SP); 454 PUSHMARK (SP);
418 XPUSHs (sv); 455 XPUSHs (sv);
419 PUTBACK; 456 PUTBACK;
420 457
421 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 458 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
422 croak ("Storable::mstore didn't return a single scalar"); 459 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
423 460
424 SPAGAIN; 461 SPAGAIN;
425 462
426 if (deref) 463 if (deref)
427 { 464 {
431 SvPVX (sv)[0] = MAGIC_R_deref; 468 SvPVX (sv)[0] = MAGIC_R_deref;
432 } 469 }
433 else 470 else
434 SETs (sv_2mortal (newSVsv (TOPs))); 471 SETs (sv_2mortal (newSVsv (TOPs)));
435 472
436 break; 473 break;
437 474
438 default: 475 default:
439 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 476 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
440 } 477 }
441 } 478 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines