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.9 by root, Sun Mar 3 04:45:18 2002 UTC vs.
Revision 1.10 by root, Tue Mar 26 17:49:24 2002 UTC

… …
23#define MAGIC_C 1 /* compressed data follows */ 23#define MAGIC_C 1 /* compressed data follows */
24#define MAGIC_undef 2 /* the special value undef */ 24#define MAGIC_undef 2 /* the special value undef */
25#define MAGIC_CR 3 /* storable (reference, freeze), compressed */ 25#define MAGIC_CR 3 /* storable (reference, freeze), compressed */
26#define MAGIC_R 4 /* storable (reference, freeze) */ 26#define MAGIC_R 4 /* storable (reference, freeze) */
27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */ 27#define MAGIC_CR_deref 5 /* storable (NO reference, freeze), compressed */
28#define MAGIC_R_deref 6 /* storable NO (reference, freeze) */ 28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
29#define MAGIC_HI 7 /* room for one higher storable major */ 29#define MAGIC_HI 7 /* room for one higher storable major */
30 30
31#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l)) 31#define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
32 32
33static CV *storable_mstore, *storable_mretrieve; 33static CV *storable_mstore, *storable_mretrieve;
34 34
35static SV * 35static SV *
36compress_sv (SV *data, char cprepend, char uprepend) 36compress_sv (SV *data, char cprepend, int uprepend)
37{ 37{
38 STRLEN usize, csize; 38 STRLEN usize, csize;
39 char *src = (char *)SvPV (data, usize); 39 char *src = (char *)SvPV (data, usize);
40 40
41 if (usize) 41 if (usize)
… …
91 91
92 if (csize) 92 if (csize)
93 { 93 {
94 SvCUR_set (ret, csize + skip); 94 SvCUR_set (ret, csize + skip);
95 } 95 }
96 else if (!uprepend) 96 else if (uprepend < 0)
97 { 97 {
98 SvREFCNT_dec (ret); 98 SvREFCNT_dec (ret);
99 ret = SvREFCNT_inc (data); 99 ret = SvREFCNT_inc (data);
100 } 100 }
101 else 101 else
102 { 102 {
103 *dst++ = 0; 103 *dst++ = uprepend;
104 104
105 Move ((void *)src, (void *)dst, usize, unsigned char); 105 Move ((void *)src, (void *)dst, usize, unsigned char);
106 106
107 SvCUR_set (ret, usize + 1); 107 SvCUR_set (ret, usize + 1);
108 } 108 }
… …
208void 208void
209compress(data) 209compress(data)
210 SV * data 210 SV * data
211 PROTOTYPE: $ 211 PROTOTYPE: $
212 PPCODE: 212 PPCODE:
213 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 213 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
214 214
215void 215void
216decompress(data) 216decompress(data)
217 SV * data 217 SV * data
218 PROTOTYPE: $ 218 PROTOTYPE: $
… …
226 sfreeze_cr = 1 226 sfreeze_cr = 1
227 sfreeze_c = 2 227 sfreeze_c = 2
228 PROTOTYPE: $ 228 PROTOTYPE: $
229 PPCODE: 229 PPCODE:
230 230
231 SvGETMAGIC (sv);
232
231 if (!SvOK (sv)) 233 if (!SvOK (sv))
232 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 234 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
233 else if (SvTYPE(sv) != SVt_IV 235 else if (SvTYPE(sv) != SVt_IV
234 && SvTYPE(sv) != SVt_NV 236 && SvTYPE(sv) != SVt_NV
237 && SvTYPE(sv) != SVt_PV
235 && SvTYPE(sv) != SVt_PV) /* mstore */ 238 && SvTYPE(sv) != SVt_PVMG+99999) /* mstore */
236 { 239 {
237 int deref = !SvROK (sv); 240 int deref = !SvROK (sv);
238 241
239 if (!storable_mstore) 242 if (!storable_mstore)
240 need_storable (); 243 need_storable ();
… …
254 sv = POPs; 257 sv = POPs;
255 258
256 if (SvPVX (sv)[0] != MAGIC_R) 259 if (SvPVX (sv)[0] != MAGIC_R)
257 croak ("Storable format changed, need newer version of Compress::LZF"); 260 croak ("Storable format changed, need newer version of Compress::LZF");
258 261
262 if (deref)
263 SvPVX (sv)[0] = MAGIC_R_deref;
264
259 if (ix) /* compress */ 265 if (ix) /* compress */
260 XPUSHs (sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, 0))); 266 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
261 else
262 {
263 if (deref)
264 SvPVX (sv)[0] = MAGIC_R_deref;
265 267
266 XPUSHs (sv); 268 XPUSHs (sv);
267 }
268 } 269 }
269 else if (sv && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 270 else if (SvTYPE (sv) == SVt_PV && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
270 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */ 271 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
271 else if (ix == 2) /* compress always */ 272 else if (ix == 2) /* compress always */
272 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 273 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
273 else /* don't compress */ 274 else /* don't compress */
274 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 275 XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));
275 276
276void 277void
277sthaw(sv) 278sthaw(sv)
… …
296 297
297 case MAGIC_C: 298 case MAGIC_C:
298 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 299 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
299 break; 300 break;
300 301
302 case MAGIC_R_deref:
303 deref = 1;
304 SvPVX (sv)[0] = MAGIC_R;
305 goto handle_MAGIC_R;
306
301 case MAGIC_CR_deref: 307 case MAGIC_CR_deref:
302 deref = 1; 308 deref = 1;
303 case MAGIC_CR: 309 case MAGIC_CR:
304 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 310 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
305 case MAGIC_R_deref: 311 if (deref)
306 if (SvPVX (sv)[0] == MAGIC_R_deref) 312 if (SvPVX (sv)[0] == MAGIC_R_deref)
307 {
308 deref = 1;
309 SvPVX (sv)[0] = MAGIC_R; 313 SvPVX (sv)[0] = MAGIC_R;
310 } 314 else
315 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
316
311 case MAGIC_R: 317 case MAGIC_R:
318 handle_MAGIC_R:
312 if (!storable_mstore) 319 if (!storable_mstore)
313 need_storable (); 320 need_storable ();
314 321
315 PUSHMARK (SP); 322 PUSHMARK (SP);
316 XPUSHs (sv); 323 XPUSHs (sv);
… …
321 328
322 SPAGAIN; 329 SPAGAIN;
323 330
324 if (deref) 331 if (deref)
325 { 332 {
326 SV *ref = SvREFCNT_inc (SvRV (TOPs)); 333 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
327
328 SvREFCNT_dec (TOPs); /* destroy superfluous ref */
329 SETs (ref);
330 334
331 if (SvPVX (sv)[0] == MAGIC_R) 335 if (SvPVX (sv)[0] == MAGIC_R)
332 SvPVX (sv)[0] = MAGIC_R; 336 SvPVX (sv)[0] = MAGIC_R_deref;
333 } 337 }
334 338 else
335 XPUSHs (POPs); /* this is a nop, hopefully */ 339 XPUSHs (POPs); /* this is a nop, hopefully */
336 340
337 break; 341 break;
338 342
339 default: 343 default:
340 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 344 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");

Diff Legend

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