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.13 by root, Sat May 18 21:48:39 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 }
… …
162 usize = (usize << 6) | (*src++ & 0x3f); 162 usize = (usize << 6) | (*src++ & 0x3f);
163 usize = (usize << 6) | (*src++ & 0x3f); 163 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 164 usize = (usize << 6) | (*src++ & 0x3f);
165 } 165 }
166 else 166 else
167 croak ("compressed data corrupted"); 167 croak ("compressed data corrupted (invalid length)");
168 168
169 ret = NEWSV (0, usize); 169 ret = NEWSV (0, usize);
170 SvPOK_only (ret); 170 SvPOK_only (ret);
171 dst = SvPVX (ret); 171 dst = SvPVX (ret);
172 172
173 if (lzf_decompress (src, csize, dst, usize) != usize) 173 if (lzf_decompress (src, csize, dst, usize) != usize)
174 croak ("compressed data corrupted", csize, skip, usize); 174 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
175 } 175 }
176 else 176 else
177 { 177 {
178 usize = csize - 1; 178 usize = csize - 1;
179 ret = NEWSV (0, usize); 179 ret = NEWSV (0, usize);
… …
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 */
235 else if (SvROK (sv)
233 else if (SvTYPE(sv) != SVt_IV 236 || (SvTYPE(sv) != SVt_IV
234 && SvTYPE(sv) != SVt_NV 237 && SvTYPE(sv) != SVt_NV
238 && SvTYPE(sv) != SVt_PV
235 && SvTYPE(sv) != SVt_PV) /* mstore */ 239 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
236 { 240 {
237 int deref = !SvROK (sv); 241 int deref = !SvROK (sv);
238 242
239 if (!storable_mstore) 243 if (!storable_mstore)
240 need_storable (); 244 need_storable ();
… …
254 sv = POPs; 258 sv = POPs;
255 259
256 if (SvPVX (sv)[0] != MAGIC_R) 260 if (SvPVX (sv)[0] != MAGIC_R)
257 croak ("Storable format changed, need newer version of Compress::LZF"); 261 croak ("Storable format changed, need newer version of Compress::LZF");
258 262
263 if (deref)
264 SvPVX (sv)[0] = MAGIC_R_deref;
265
259 if (ix) /* compress */ 266 if (ix) /* compress */
260 XPUSHs (sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, 0))); 267 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 268
266 XPUSHs (sv); 269 XPUSHs (sv);
267 }
268 } 270 }
269 else if (sv && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI)) 271 else if (SvPOKp (sv) && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
270 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */ 272 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
271 else if (ix == 2) /* compress always */ 273 else if (ix == 2) /* compress always */
272 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 274 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
273 else /* don't compress */ 275 else /* don't compress */
274 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 276 XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));
275 277
276void 278void
277sthaw(sv) 279sthaw(sv)
… …
296 298
297 case MAGIC_C: 299 case MAGIC_C:
298 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 300 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
299 break; 301 break;
300 302
303 case MAGIC_R_deref:
304 deref = 1;
305 SvPVX (sv)[0] = MAGIC_R;
306 goto handle_MAGIC_R;
307
301 case MAGIC_CR_deref: 308 case MAGIC_CR_deref:
302 deref = 1; 309 deref = 1;
303 case MAGIC_CR: 310 case MAGIC_CR:
304 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 311 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
305 case MAGIC_R_deref: 312 if (deref)
306 if (SvPVX (sv)[0] == MAGIC_R_deref) 313 if (SvPVX (sv)[0] == MAGIC_R_deref)
307 {
308 deref = 1;
309 SvPVX (sv)[0] = MAGIC_R; 314 SvPVX (sv)[0] = MAGIC_R;
310 } 315 else
316 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
317
311 case MAGIC_R: 318 case MAGIC_R:
319 handle_MAGIC_R:
312 if (!storable_mstore) 320 if (!storable_mstore)
313 need_storable (); 321 need_storable ();
314 322
315 PUSHMARK (SP); 323 PUSHMARK (SP);
316 XPUSHs (sv); 324 XPUSHs (sv);
… …
321 329
322 SPAGAIN; 330 SPAGAIN;
323 331
324 if (deref) 332 if (deref)
325 { 333 {
326 SV *ref = SvREFCNT_inc (SvRV (TOPs)); 334 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
327
328 SvREFCNT_dec (TOPs); /* destroy superfluous ref */
329 SETs (ref);
330 335
331 if (SvPVX (sv)[0] == MAGIC_R) 336 if (SvPVX (sv)[0] == MAGIC_R)
332 SvPVX (sv)[0] = MAGIC_R; 337 SvPVX (sv)[0] = MAGIC_R_deref;
333 } 338 }
334 339 else
335 XPUSHs (POPs); /* this is a nop, hopefully */ 340 XPUSHs (POPs); /* this is a nop, hopefully */
336 341
337 break; 342 break;
338 343
339 default: 344 default:
340 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 345 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
341 } 346 }
342 } 347 }
343 else 348 else
344 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 349 XPUSHs (sv_2mortal (newSVsv (sv)));

Diff Legend

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