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.6 by root, Thu Sep 27 20:09:02 2001 UTC vs.
Revision 1.13 by root, Sat May 18 21:48:39 2002 UTC

… …
22#define MAGIC_U 0 /* uncompressed data follows */ 22#define MAGIC_U 0 /* uncompressed data follows */
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 */
28#define MAGIC_R_deref 6 /* storable (NO reference, freeze) */
27#define MAGIC_HI 7 /* room for one higher storable major */ 29#define MAGIC_HI 7 /* room for one higher storable major */
28 30
29#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))
30 32
31static CV *storable_mstore, *storable_mretrieve; 33static CV *storable_mstore, *storable_mretrieve;
32 34
33static SV * 35static SV *
34compress_sv (SV *data, char cprepend, char uprepend) 36compress_sv (SV *data, char cprepend, int uprepend)
35{ 37{
36 STRLEN usize, csize; 38 STRLEN usize, csize;
37 char *src = (char *)SvPV (data, usize); 39 char *src = (char *)SvPV (data, usize);
38 40
39 if (usize) 41 if (usize)
… …
89 91
90 if (csize) 92 if (csize)
91 { 93 {
92 SvCUR_set (ret, csize + skip); 94 SvCUR_set (ret, csize + skip);
93 } 95 }
94 else if (!uprepend) 96 else if (uprepend < 0)
95 { 97 {
96 SvREFCNT_dec (ret); 98 SvREFCNT_dec (ret);
97 ret = SvREFCNT_inc (data); 99 ret = SvREFCNT_inc (data);
98 } 100 }
99 else 101 else
100 { 102 {
101 *dst++ = 0; 103 *dst++ = uprepend;
102 104
103 Move ((void *)src, (void *)dst, usize, unsigned char); 105 Move ((void *)src, (void *)dst, usize, unsigned char);
104 106
105 SvCUR_set (ret, usize + 1); 107 SvCUR_set (ret, usize + 1);
106 } 108 }
… …
160 usize = (usize << 6) | (*src++ & 0x3f); 162 usize = (usize << 6) | (*src++ & 0x3f);
161 usize = (usize << 6) | (*src++ & 0x3f); 163 usize = (usize << 6) | (*src++ & 0x3f);
162 usize = (usize << 6) | (*src++ & 0x3f); 164 usize = (usize << 6) | (*src++ & 0x3f);
163 } 165 }
164 else 166 else
165 croak ("compressed data corrupted"); 167 croak ("compressed data corrupted (invalid length)");
166 168
167 ret = NEWSV (0, usize); 169 ret = NEWSV (0, usize);
168 SvPOK_only (ret); 170 SvPOK_only (ret);
169 dst = SvPVX (ret); 171 dst = SvPVX (ret);
170 172
171 if (lzf_decompress (src, csize, dst, usize) != usize) 173 if (lzf_decompress (src, csize, dst, usize) != usize)
172 croak ("compressed data corrupted", csize, skip, usize); 174 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
173 } 175 }
174 else 176 else
175 { 177 {
176 usize = csize - 1; 178 usize = csize - 1;
177 ret = NEWSV (0, usize); 179 ret = NEWSV (0, usize);
… …
206void 208void
207compress(data) 209compress(data)
208 SV * data 210 SV * data
209 PROTOTYPE: $ 211 PROTOTYPE: $
210 PPCODE: 212 PPCODE:
211 XPUSHs (sv_2mortal (compress_sv (data, 0, 1))); 213 XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
212 214
213void 215void
214decompress(data) 216decompress(data)
215 SV * data 217 SV * data
216 PROTOTYPE: $ 218 PROTOTYPE: $
… …
224 sfreeze_cr = 1 226 sfreeze_cr = 1
225 sfreeze_c = 2 227 sfreeze_c = 2
226 PROTOTYPE: $ 228 PROTOTYPE: $
227 PPCODE: 229 PPCODE:
228 230
231 SvGETMAGIC (sv);
232
229 if (!SvOK (sv)) 233 if (!SvOK (sv))
230 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 234 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
235 else if (SvROK (sv)
231 else if (SvTYPE(sv) != SVt_IV 236 || (SvTYPE(sv) != SVt_IV
232 && SvTYPE(sv) != SVt_NV 237 && SvTYPE(sv) != SVt_NV
238 && SvTYPE(sv) != SVt_PV
233 && SvTYPE(sv) != SVt_PV) /* mstore */ 239 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
234 { 240 {
241 int deref = !SvROK (sv);
242
235 if (!storable_mstore) 243 if (!storable_mstore)
236 need_storable (); 244 need_storable ();
245
246 if (deref)
247 sv = newRV_noinc (sv);
237 248
238 PUSHMARK (SP); 249 PUSHMARK (SP);
239 XPUSHs (sv); 250 XPUSHs (sv);
240 PUTBACK; 251 PUTBACK;
241 252
… …
247 sv = POPs; 258 sv = POPs;
248 259
249 if (SvPVX (sv)[0] != MAGIC_R) 260 if (SvPVX (sv)[0] != MAGIC_R)
250 croak ("Storable format changed, need newer version of Compress::LZF"); 261 croak ("Storable format changed, need newer version of Compress::LZF");
251 262
263 if (deref)
264 SvPVX (sv)[0] = MAGIC_R_deref;
265
252 if (ix) /* compress */ 266 if (ix) /* compress */
253 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0))); 267 sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
254 else 268
255 XPUSHs (sv); 269 XPUSHs (sv);
256 } 270 }
257 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))
258 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 */
259 else if (ix == 2) /* compress always */ 273 else if (ix == 2) /* compress always */
260 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0))); 274 XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
261 else /* don't compress */ 275 else /* don't compress */
262 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 276 XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));
263 277
264void 278void
265sthaw(sv) 279sthaw(sv)
266 SV * sv 280 SV * sv
267 PROTOTYPE: $ 281 PROTOTYPE: $
268 PPCODE: 282 PPCODE:
269 283
284 int deref = 0;
285
286 SvGETMAGIC (sv);
270 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI)) 287 if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI))
271 { 288 {
272 switch (SvPVX (sv)[0]) 289 switch (SvPVX (sv)[0])
273 { 290 {
274 case MAGIC_undef: 291 case MAGIC_undef:
… …
281 298
282 case MAGIC_C: 299 case MAGIC_C:
283 XPUSHs (sv_2mortal (decompress_sv (sv, 1))); 300 XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
284 break; 301 break;
285 302
303 case MAGIC_R_deref:
304 deref = 1;
305 SvPVX (sv)[0] = MAGIC_R;
306 goto handle_MAGIC_R;
307
308 case MAGIC_CR_deref:
309 deref = 1;
286 case MAGIC_CR: 310 case MAGIC_CR:
287 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */ 311 sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
312 if (deref)
313 if (SvPVX (sv)[0] == MAGIC_R_deref)
314 SvPVX (sv)[0] = MAGIC_R;
315 else
316 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
317
288 case MAGIC_R: 318 case MAGIC_R:
319 handle_MAGIC_R:
289 if (!storable_mstore) 320 if (!storable_mstore)
290 need_storable (); 321 need_storable ();
291 322
292 PUSHMARK (SP); 323 PUSHMARK (SP);
293 XPUSHs (sv); 324 XPUSHs (sv);
… …
296 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR)) 327 if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
297 croak ("Storable::mstore didn't return a single scalar"); 328 croak ("Storable::mstore didn't return a single scalar");
298 329
299 SPAGAIN; 330 SPAGAIN;
300 331
332 if (deref)
333 {
334 SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
335
336 if (SvPVX (sv)[0] == MAGIC_R)
337 SvPVX (sv)[0] = MAGIC_R_deref;
338 }
339 else
301 /*XPUSHs (POPs); this is a nop, hopefully */ 340 XPUSHs (POPs); /* this is a nop, hopefully */
302 341
303 break; 342 break;
304 343
305 default: 344 default:
306 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?");
307 } 346 }
308 } 347 }
309 else 348 else
310 XPUSHs (sv_2mortal (SvREFCNT_inc (sv))); 349 XPUSHs (sv_2mortal (newSVsv (sv)));

Diff Legend

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