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.32 by root, Sat Jun 27 19:52:44 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 LZF_STATE *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 New (0, state, 1, LZF_STATE);
99 if (!state)
100 croak ("Compress::LZF unable to allocate memory for compression state");
101
102 if (usize > 1000) perlinterp_release ();
103 /* 11 bytes is the smallest compressible string */ 103 /* 11 bytes is the smallest compressible string */
104 csize = usize < 11 ? 0 : 104 csize = usize < 11 ? 0 :
105 lzf_compress (src, usize, 105 (best ? lzf_compress_best (src, usize, dst + skip, usize - skip)
106 dst + skip, 106 : lzf_compress (src, usize, dst + skip, usize - skip, *state));
107 usize - skip); 107 if (usize > 1000) perlinterp_acquire ();
108
109 Safefree (state);
108 110
109 if (csize) 111 if (csize)
110 { 112 {
111 SvCUR_set (ret, csize + skip); 113 SvCUR_set (ret, csize + skip);
112 } 114 }
… …
132 134
133static SV * 135static SV *
134decompress_sv (SV *data, int skip) 136decompress_sv (SV *data, int skip)
135{ 137{
136 STRLEN usize, csize; 138 STRLEN usize, csize;
137 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 139 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
138 140
139 if (csize) 141 if (csize)
140 { 142 {
141 void *dst; 143 void *dst;
142 SV *ret; 144 SV *ret;
145 int res;
143 146
144 csize -= skip; 147 csize -= skip;
145 148
146 if (src[0]) 149 if (src[0])
147 { 150 {
148 if (!(src[0] & 0x80)) 151 if (!(src[0] & 0x80) && csize >= 1)
149 { 152 {
150 csize -= 1; 153 csize -= 1;
151 usize = *src++ & 0xff; 154 usize = *src++ & 0xff;
152 } 155 }
153 else if (!(src[0] & 0x20)) 156 else if (!(src[0] & 0x20) && csize >= 2)
154 { 157 {
155 csize -= 2; 158 csize -= 2;
156 usize = *src++ & 0x1f; 159 usize = *src++ & 0x1f;
157 usize = (usize << 6) | (*src++ & 0x3f); 160 usize = (usize << 6) | (*src++ & 0x3f);
158 } 161 }
159 else if (!(src[0] & 0x10)) 162 else if (!(src[0] & 0x10) && csize >= 3)
160 { 163 {
161 csize -= 3; 164 csize -= 3;
162 usize = *src++ & 0x0f; 165 usize = *src++ & 0x0f;
163 usize = (usize << 6) | (*src++ & 0x3f); 166 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 167 usize = (usize << 6) | (*src++ & 0x3f);
165 } 168 }
166 else if (!(src[0] & 0x08)) 169 else if (!(src[0] & 0x08) && csize >= 4)
167 { 170 {
168 csize -= 4; 171 csize -= 4;
169 usize = *src++ & 0x07; 172 usize = *src++ & 0x07;
170 usize = (usize << 6) | (*src++ & 0x3f); 173 usize = (usize << 6) | (*src++ & 0x3f);
171 usize = (usize << 6) | (*src++ & 0x3f); 174 usize = (usize << 6) | (*src++ & 0x3f);
172 usize = (usize << 6) | (*src++ & 0x3f); 175 usize = (usize << 6) | (*src++ & 0x3f);
173 } 176 }
174 else if (!(src[0] & 0x04)) 177 else if (!(src[0] & 0x04) && csize >= 5)
175 { 178 {
176 csize -= 5; 179 csize -= 5;
177 usize = *src++ & 0x03; 180 usize = *src++ & 0x03;
178 usize = (usize << 6) | (*src++ & 0x3f); 181 usize = (usize << 6) | (*src++ & 0x3f);
179 usize = (usize << 6) | (*src++ & 0x3f); 182 usize = (usize << 6) | (*src++ & 0x3f);
180 usize = (usize << 6) | (*src++ & 0x3f); 183 usize = (usize << 6) | (*src++ & 0x3f);
181 usize = (usize << 6) | (*src++ & 0x3f); 184 usize = (usize << 6) | (*src++ & 0x3f);
182 } 185 }
183 else if (!(src[0] & 0x02)) 186 else if (!(src[0] & 0x02) && csize >= 6)
184 { 187 {
185 csize -= 6; 188 csize -= 6;
186 usize = *src++ & 0x01; 189 usize = *src++ & 0x01;
187 usize = (usize << 6) | (*src++ & 0x3f); 190 usize = (usize << 6) | (*src++ & 0x3f);
188 usize = (usize << 6) | (*src++ & 0x3f); 191 usize = (usize << 6) | (*src++ & 0x3f);
… …
190 usize = (usize << 6) | (*src++ & 0x3f); 193 usize = (usize << 6) | (*src++ & 0x3f);
191 usize = (usize << 6) | (*src++ & 0x3f); 194 usize = (usize << 6) | (*src++ & 0x3f);
192 } 195 }
193 else 196 else
194 croak ("compressed data corrupted (invalid length)"); 197 croak ("compressed data corrupted (invalid length)");
195 198
199 if (!usize)
200 croak ("compressed data corrupted (invalid length)");
201
196 ret = NEWSV (0, usize); 202 ret = NEWSV (0, usize);
197 SvPOK_only (ret); 203 SvPOK_only (ret);
198 dst = SvPVX (ret); 204 dst = SvPVX (ret);
199 205
206 if (usize > 2000) perlinterp_release ();
200 if (lzf_decompress (src, csize, dst, usize) != usize) 207 res = lzf_decompress (src, csize, dst, usize) != usize;
208 if (usize > 2000) perlinterp_acquire ();
209
210 if (res)
211 {
212 SvREFCNT_dec (ret);
201 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 213 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
214 }
202 } 215 }
203 else 216 else
204 { 217 {
205 usize = csize - 1; 218 usize = csize - 1;
206 ret = NEWSV (0, usize); 219 ret = NEWSV (0, usize | 1);
207 SvPOK_only (ret); 220 SvPOK_only (ret);
208 221
209 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 222 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
210 } 223 }
211 224
… …
216 else 229 else
217 return newSVpvn ("", 0); 230 return newSVpvn ("", 0);
218} 231}
219 232
220static void 233static void
221need_storable(void) 234need_storable (void)
222{ 235{
223#if PATCHLEVEL < 6 236 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 237
231 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV)); 238 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)); 239 storable_mretrieve = (CV *)SvREFCNT_inc (GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV)));
233} 240}
234 241
235MODULE = Compress::LZF PACKAGE = Compress::LZF 242MODULE = Compress::LZF PACKAGE = Compress::LZF
236 243
237BOOT: 244BOOT:
… …
247 PROTOTYPE: $$$ 254 PROTOTYPE: $$$
248 PPCODE: 255 PPCODE:
249 SvSetSV (serializer_package , package ); 256 SvSetSV (serializer_package , package );
250 SvSetSV (serializer_mstore , mstore ); 257 SvSetSV (serializer_mstore , mstore );
251 SvSetSV (serializer_mretrieve, mretrieve); 258 SvSetSV (serializer_mretrieve, mretrieve);
252 storable_mstore = 259 SvREFCNT_dec (storable_mstore ); storable_mstore = 0;
253 storable_mretrieve = 0; 260 SvREFCNT_dec (storable_mretrieve); storable_mretrieve = 0;
254 261
255void 262void
256compress(data) 263compress(data)
257 SV * data 264 SV * data
265 ALIAS:
266 compress_best = 1
258 PROTOTYPE: $ 267 PROTOTYPE: $
259 PPCODE: 268 PPCODE:
260 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U))); 269 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U, ix)));
261 270
262void 271void
263decompress(data) 272decompress(data)
264 SV * data 273 SV * data
265 PROTOTYPE: $ 274 PROTOTYPE: $
… …
268 277
269void 278void
270sfreeze(sv) 279sfreeze(sv)
271 SV * sv 280 SV * sv
272 ALIAS: 281 ALIAS:
282 sfreeze = 0
273 sfreeze_cr = 1 283 sfreeze_cr = 1
274 sfreeze_c = 2 284 sfreeze_c = 2
285 sfreeze_best = 4
286 sfreeze_cr_best = 5
287 sfreeze_c_best = 6
275 PROTOTYPE: $ 288 PROTOTYPE: $
276 PPCODE: 289 PPCODE:
290{
291 int best = ix & 4;
292 ix &= 3;
277 293
278 SvGETMAGIC (sv); 294 SvGETMAGIC (sv);
279 295
280 if (!SvOK (sv)) 296 if (!SvOK (sv))
281 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 297 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
282 else if (SvROK (sv) 298 else if (SvROK (sv)
299 || SvUTF8 (sv)
283 || (SvTYPE(sv) != SVt_IV 300 || (SvTYPE(sv) != SVt_IV
284 && SvTYPE(sv) != SVt_NV 301 && SvTYPE(sv) != SVt_NV
285 && SvTYPE(sv) != SVt_PV 302 && SvTYPE(sv) != SVt_PV
286 && SvTYPE(sv) != SVt_PVIV 303 && SvTYPE(sv) != SVt_PVIV
287 && SvTYPE(sv) != SVt_PVNV 304 && SvTYPE(sv) != SVt_PVNV
288 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 305 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
289 { 306 {
290 int deref = !SvROK (sv); 307 int deref = !SvROK (sv);
308 char *pv;
291 309
292 if (!storable_mstore) 310 if (!storable_mstore)
311 {
312 PUTBACK;
293 need_storable (); 313 need_storable ();
314 SPAGAIN;
315 }
294 316
295 if (deref) 317 if (deref)
296 sv = newRV_noinc (sv); 318 sv = newRV_noinc (sv);
297 319
298 PUSHMARK (SP); 320 PUSHMARK (SP);
299 XPUSHs (sv); 321 XPUSHs (sv);
300 PUTBACK; 322 PUTBACK;
301 323
302 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR)) 324 if (1 != call_sv ((SV *)storable_mstore, G_SCALAR))
303 croak ("Storable::mstore didn't return a single scalar"); 325 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mstore));
304 326
305 SPAGAIN; 327 SPAGAIN;
306 328
307 sv = POPs; 329 sv = POPs;
330 pv = SvPV_nolen (sv);
308 331
309 if (SvPVX (sv)[0] == MAGIC_R) 332 if (*pv == MAGIC_R)
310 { 333 {
311 if (deref) 334 if (deref)
312 SvPVX (sv)[0] = MAGIC_R_deref; 335 *pv = MAGIC_R_deref;
313 } 336 }
314 else 337 else
315 { 338 {
316 char pfx[2]; 339 char pfx[2];
317 340
… …
320 343
321 sv_insert (sv, 0, 0, pfx, 2); 344 sv_insert (sv, 0, 0, pfx, 2);
322 } 345 }
323 346
324 if (ix) /* compress */ 347 if (ix) /* compress */
325 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1)); 348 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1, best));
326 349
327 XPUSHs (sv); 350 XPUSHs (sv);
328 } 351 }
329 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 352 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 */ 353 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U, best))); /* need to prefix only */
331 else if (ix == 2) /* compress always */ 354 else if (ix == 2) /* compress always */
332 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1))); 355 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1, best)));
333 else if (SvNIOK (sv)) /* don't compress */ 356 else if (SvNIOK (sv)) /* don't compress */
334 { 357 {
335 STRLEN len; 358 STRLEN len;
336 char *s = SvPV (sv, len); 359 char *s = SvPV (sv, len);
337 XPUSHs (sv_2mortal (newSVpvn (s, len))); 360 XPUSHs (sv_2mortal (newSVpvn (s, len)));
338 } 361 }
339 else /* don't compress */ 362 else /* don't compress */
340 XPUSHs (sv_2mortal (newSVsv (sv))); 363 XPUSHs (sv_2mortal (newSVsv (sv)));
364}
341 365
342void 366void
343sthaw(sv) 367sthaw(sv)
344 SV * sv 368 SV * sv
345 PROTOTYPE: $ 369 PROTOTYPE: $
… …
347{ 371{
348 STRLEN svlen; 372 STRLEN svlen;
349 int deref = 0; 373 int deref = 0;
350 374
351 SvGETMAGIC (sv); 375 SvGETMAGIC (sv);
352 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI)) 376 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
353 { 377 {
354 redo: 378 redo:
355 379
356 switch (SvPVX (sv)[0]) 380 switch (SvPVX (sv)[0])
357 { 381 {
… …
366 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 390 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
367 391
368 sv_chop (sv, SvPVX (sv) + 2); 392 sv_chop (sv, SvPVX (sv) + 2);
369 393
370 if (!storable_mstore) 394 if (!storable_mstore)
395 {
396 PUTBACK;
371 need_storable (); 397 need_storable ();
398 SPAGAIN;
399 }
372 400
373 PUSHMARK (SP); 401 PUSHMARK (SP);
374 XPUSHs (sv); 402 XPUSHs (sv);
375 PUTBACK; 403 PUTBACK;
376 404
377 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 405 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
378 croak ("Storable::mstore didn't return a single scalar"); 406 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
379 407
380 SPAGAIN; 408 SPAGAIN;
381 409
382 if (deref) 410 if (deref)
383 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs)))); 411 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
… …
410 goto redo; 438 goto redo;
411 439
412 case MAGIC_R: 440 case MAGIC_R:
413 handle_MAGIC_R: 441 handle_MAGIC_R:
414 if (!storable_mstore) 442 if (!storable_mstore)
443 {
444 PUTBACK;
415 need_storable (); 445 need_storable ();
446 SPAGAIN;
447 }
416 448
417 PUSHMARK (SP); 449 PUSHMARK (SP);
418 XPUSHs (sv); 450 XPUSHs (sv);
419 PUTBACK; 451 PUTBACK;
420 452
421 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 453 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
422 croak ("Storable::mstore didn't return a single scalar"); 454 croak ("%s didn't return a single scalar", SvPVbyte_nolen (serializer_mretrieve));
423 455
424 SPAGAIN; 456 SPAGAIN;
425 457
426 if (deref) 458 if (deref)
427 { 459 {
… …
431 SvPVX (sv)[0] = MAGIC_R_deref; 463 SvPVX (sv)[0] = MAGIC_R_deref;
432 } 464 }
433 else 465 else
434 SETs (sv_2mortal (newSVsv (TOPs))); 466 SETs (sv_2mortal (newSVsv (TOPs)));
435 467
436 break; 468 break;
437 469
438 default: 470 default:
439 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 471 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
440 } 472 }
441 } 473 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines