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

perl: clean up

Browse Source
This commit is contained in:
Fuji, Goro 2010-10-21 23:26:03 +09:00
parent c790735b9f
commit 92b346efa7
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
#define NEED_newRV_noinc #define NEED_newRV_noinc
#define NEED_sv_2pv_flags #define NEED_sv_2pv_flags
#define NEED_my_snprintf
#include "xshelper.h" #include "xshelper.h"
#define MY_CXT_KEY "Data::MessagePack::_unpack_guts" XS_VERSION #define MY_CXT_KEY "Data::MessagePack::_unpack_guts" XS_VERSION
@ -121,7 +120,8 @@ STATIC_INLINE int template_callback_IV(unpack_user* u PERL_UNUSED_DECL, IV const
return 0; return 0;
} }
static const char* str_from_uint64(char* buf_end, uint64_t v) /* workaround win32 problems (my_snprintf(%llu) returns incorrect values ) */
static char* str_from_uint64(char* buf_end, uint64_t v)
{ {
char *p = buf_end; char *p = buf_end;
*--p = '\0'; *--p = '\0';
@ -131,9 +131,8 @@ static const char* str_from_uint64(char* buf_end, uint64_t v)
return p; return p;
} }
static const char* str_from_int64(char* buf_end, int64_t v) static const char* str_from_int64(char* buf_end, int64_t const v) {
{ bool const minus = v < 0;
int minus = v < 0;
char* p = str_from_uint64(buf_end, minus ? -v : v); char* p = str_from_uint64(buf_end, minus ? -v : v);
if (minus) if (minus)
*--p = '-'; *--p = '-';
@ -144,13 +143,8 @@ static int template_callback_uint64(unpack_user* u PERL_UNUSED_DECL, uint64_t co
{ {
dTHX; dTHX;
char tbuf[64]; char tbuf[64];
#if 1 /* workaround for win32-32bit (my_snprintf(%llu) returns are incorrect) */ const char* const s = str_from_uint64(tbuf + sizeof(tbuf), d);
char* s = str_from_uint64(tbuf + sizeof(tbuf), d);
*o = newSVpvn(s, tbuf + sizeof(tbuf) - 1 - s); *o = newSVpvn(s, tbuf + sizeof(tbuf) - 1 - s);
#else
STRLEN const len = my_snprintf(tbuf, sizeof(tbuf), "%llu", d);
*o = newSVpvn(tbuf, len);
#endif
return 0; return 0;
} }
@ -158,13 +152,8 @@ static int template_callback_int64(unpack_user* u PERL_UNUSED_DECL, int64_t cons
{ {
dTHX; dTHX;
char tbuf[64]; char tbuf[64];
#if 1 /* workaround for win32-32bit (my_snprintf(%lld) returns are incorrect) */ const char* const s = str_from_int64(tbuf + sizeof(tbuf), d);
char* s = str_from_int64(tbuf + sizeof(tbuf), d);
*o = newSVpvn(s, tbuf + sizeof(tbuf) - 1 - s); *o = newSVpvn(s, tbuf + sizeof(tbuf) - 1 - s);
#else
STRLEN const len = my_snprintf(tbuf, sizeof(tbuf), "%lld", d);
*o = newSVpvn(tbuf, len);
#endif
return 0; return 0;
} }