[ViewVC] Diff of: cvs/Compress-LZF/LZF.xs

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

Diff Legend

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

Comparing Compress-LZF/LZF.xs (file contents): Revision 1.12 by root, Fri May 17 18:59:24 2002 UTC vs. Revision 1.33 by root, Sun Jun 28 18:18:03 2015 UTC

Diff Legend

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.12 by root, Fri May 17 18:59:24 2002 UTC vs.
Revision 1.33 by root, Sun Jun 28 18:18:03 2015 UTC