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

Diff Legend

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