ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CBOR-XS/XS.xs
(Generate patch)

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.43 by root, Sun Jan 5 14:24:54 2014 UTC vs.
Revision 1.48 by root, Sun Sep 20 23:25:53 2015 UTC

… …
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11 11
12#define ECB_NO_THREADS 1
12#include "ecb.h" 13#include "ecb.h"
13 14
14// compatibility with perl <5.18 15// compatibility with perl <5.18
15#ifndef HvNAMELEN_get 16#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv)) 17# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
… …
323 324
324 ++enc->depth; 325 ++enc->depth;
325 326
326 encode_uint (enc, MAJOR_ARRAY, len + 1); 327 encode_uint (enc, MAJOR_ARRAY, len + 1);
327 328
329 if (SvMAGICAL (av))
328 for (i = 0; i <= len; ++i) 330 for (i = 0; i <= len; ++i)
329 { 331 {
330 SV **svp = av_fetch (av, i, 0); 332 SV **svp = av_fetch (av, i, 0);
331 encode_sv (enc, svp ? *svp : &PL_sv_undef); 333 encode_sv (enc, svp ? *svp : &PL_sv_undef);
332 } 334 }
335 else
336 for (i = 0; i <= len; ++i)
337 {
338 SV *sv = AvARRAY (av)[i];
339 encode_sv (enc, sv ? sv : &PL_sv_undef);
340 }
333 341
334 --enc->depth; 342 --enc->depth;
335} 343}
336 344
337static void 345static void
… …
576} 584}
577 585
578static SV * 586static SV *
579encode_cbor (SV *scalar, CBOR *cbor) 587encode_cbor (SV *scalar, CBOR *cbor)
580{ 588{
581 enc_t enc = { }; 589 enc_t enc = { 0 };
582 590
583 enc.cbor = *cbor; 591 enc.cbor = *cbor;
584 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 592 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
585 enc.cur = SvPVX (enc.sv); 593 enc.cur = SvPVX (enc.sv);
586 enc.end = SvEND (enc.sv); 594 enc.end = SvEND (enc.sv);
… …
1155} 1163}
1156 1164
1157static SV * 1165static SV *
1158decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1166decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1159{ 1167{
1160 dec_t dec = { }; 1168 dec_t dec = { 0 };
1161 SV *sv; 1169 SV *sv;
1162 STRLEN len; 1170 STRLEN len;
1163 char *data = SvPVbyte (string, len); 1171 char *data = SvPVbyte (string, len);
1164 1172
1165 if (len > cbor->max_size && cbor->max_size) 1173 if (len > cbor->max_size && cbor->max_size)
… …
1256 1264
1257 int major = *p >> MAJOR_SHIFT; 1265 int major = *p >> MAJOR_SHIFT;
1258 1266
1259 switch (major) 1267 switch (major)
1260 { 1268 {
1269 case MAJOR_TAG >> MAJOR_SHIFT:
1270 ++count; // tags merely prefix another value
1271 break;
1272
1261 case MAJOR_BYTES >> MAJOR_SHIFT: 1273 case MAJOR_BYTES >> MAJOR_SHIFT:
1262 case MAJOR_TEXT >> MAJOR_SHIFT: 1274 case MAJOR_TEXT >> MAJOR_SHIFT:
1263 case MAJOR_ARRAY >> MAJOR_SHIFT: 1275 case MAJOR_ARRAY >> MAJOR_SHIFT:
1264 case MAJOR_MAP >> MAJOR_SHIFT: 1276 case MAJOR_MAP >> MAJOR_SHIFT:
1265 { 1277 {

Diff Legend

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