generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-19 13:02:13 +01:00
Code Issues Projects Releases Wiki Activity

Remove an unused user data: source (sv)

Browse Source
This commit is contained in:
gfx 2010-09-15 14:06:10 +09:00
parent 6a60cb4dc0
commit 83acd6529f
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
perl/xs-src/unpack.c
View File

@ -3,9 +3,8 @@
#include "xshelper.h" #include "xshelper.h"
typedef struct { typedef struct {
int finished; bool finished;
SV* source; bool incremented;
int incremented;
} unpack_user; } unpack_user;
#include "msgpack/unpack_define.h" #include "msgpack/unpack_define.h"
@ -211,7 +210,7 @@ STATIC_INLINE int template_callback_raw(unpack_user* u PERL_UNUSED_DECL, const c
STATIC_INLINE SV* _msgpack_unpack(SV* data, size_t limit PERL_UNUSED_DECL) { STATIC_INLINE SV* _msgpack_unpack(SV* data, size_t limit PERL_UNUSED_DECL) {
msgpack_unpack_t mp; msgpack_unpack_t mp;
dTHX; dTHX;
unpack_user u = {0, &PL_sv_undef, false}; unpack_user u = {false, false};
int ret; int ret;
size_t from = 0; size_t from = 0;
STRLEN dlen; STRLEN dlen;
@ -221,10 +220,7 @@ STATIC_INLINE SV* _msgpack_unpack(SV* data, size_t limit PERL_UNUSED_DECL) {
template_init(&mp); template_init(&mp);
mp.user = u; mp.user = u;
mp.user.source = data;
ret = template_execute(&mp, dptr, (size_t)dlen, &from); ret = template_execute(&mp, dptr, (size_t)dlen, &from);
mp.user.source = &PL_sv_undef;
obj = template_data(&mp); obj = template_data(&mp);
if(ret < 0) { if(ret < 0) {
@ -264,7 +260,7 @@ XS(xs_unpack) {
STATIC_INLINE void _reset(SV* self) { STATIC_INLINE void _reset(SV* self) {
dTHX; dTHX;
unpack_user u = {0, &PL_sv_undef, 0}; unpack_user u = {false, false};
UNPACKER(self, mp); UNPACKER(self, mp);
template_init(mp); template_init(mp);
@ -302,17 +298,15 @@ STATIC_INLINE SV* _execute_impl(SV* self, SV* data, UV off, I32 limit) {
Perl_croak(aTHX_ "offset is bigger than data buffer size."); Perl_croak(aTHX_ "offset is bigger than data buffer size.");
} }
mp->user.source = data;
ret = template_execute(mp, dptr, (size_t)dlen, &from); ret = template_execute(mp, dptr, (size_t)dlen, &from);
mp->user.source = &PL_sv_undef;
if(ret < 0) { if(ret < 0) {
Perl_croak(aTHX_ "parse error."); Perl_croak(aTHX_ "parse error.");
} else if(ret > 0) { } else if(ret > 0) {
mp->user.finished = 1; mp->user.finished = true;
return sv_2mortal(newSVuv(from)); return sv_2mortal(newSVuv(from));
} else { } else {
mp->user.finished = 0; mp->user.finished = false;
return sv_2mortal(newSVuv(from)); return sv_2mortal(newSVuv(from));
} }
} }
@ -335,7 +329,7 @@ XS(xs_unpacker_execute) {
SV * d2 = template_data(mp); SV * d2 = template_data(mp);
if (!mp->user.incremented && d2) { if (!mp->user.incremented && d2) {
SvREFCNT_inc(d2); SvREFCNT_inc(d2);
mp->user.incremented = 1; mp->user.incremented = true;
} }
} }
} }
@ -366,7 +360,7 @@ XS(xs_unpacker_is_finished) {
} }
UNPACKER(ST(0), mp); UNPACKER(ST(0), mp);
ST(0) = (mp->user.finished) ? &PL_sv_yes : &PL_sv_no; ST(0) = boolSV(mp->user.finished);
XSRETURN(1); XSRETURN(1);
} }