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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.90 by root, Sun Jul 20 17:55:19 2008 UTC vs.
Revision 1.94 by root, Thu Nov 20 03:59:53 2008 UTC

194INLINE void 194INLINE void
195need (enc_t *enc, STRLEN len) 195need (enc_t *enc, STRLEN len)
196{ 196{
197 if (expect_false (enc->cur + len >= enc->end)) 197 if (expect_false (enc->cur + len >= enc->end))
198 { 198 {
199 STRLEN cur = enc->cur - SvPVX (enc->sv); 199 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
200 SvGROW (enc->sv, cur + len + 1); 200 SvGROW (enc->sv, cur + len + 1);
201 enc->cur = SvPVX (enc->sv) + cur; 201 enc->cur = SvPVX (enc->sv) + cur;
202 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 202 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
203 } 203 }
204} 204}
280 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 280 (int)((uch - 0x10000) % 0x400 + 0xDC00));
281 enc->cur += 12; 281 enc->cur += 12;
282 } 282 }
283 else 283 else
284 { 284 {
285 static char hexdigit [16] = "0123456789abcdef";
286 need (enc, len += 5); 285 need (enc, len += 5);
287 *enc->cur++ = '\\'; 286 *enc->cur++ = '\\';
288 *enc->cur++ = 'u'; 287 *enc->cur++ = 'u';
289 *enc->cur++ = hexdigit [ uch >> 12 ]; 288 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
290 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 289 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
291 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 290 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
292 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 291 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
293 } 292 }
294 293
295 str += clen; 294 str += clen;
296 } 295 }
297 else if (enc->json.flags & F_LATIN1) 296 else if (enc->json.flags & F_LATIN1)
461 460
462 encode_ch (enc, '{'); 461 encode_ch (enc, '{');
463 462
464 // for canonical output we have to sort by keys first 463 // for canonical output we have to sort by keys first
465 // actually, this is mostly due to the stupid so-called 464 // actually, this is mostly due to the stupid so-called
466 // security workaround added somewhere in 5.8.x. 465 // security workaround added somewhere in 5.8.x
467 // that randomises hash orderings 466 // that randomises hash orderings
468 if (enc->json.flags & F_CANONICAL) 467 if (enc->json.flags & F_CANONICAL)
469 { 468 {
470 int count = hv_iterinit (hv); 469 int count = hv_iterinit (hv);
471 470
1411{ 1410{
1412 dec_t dec; 1411 dec_t dec;
1413 STRLEN offset; 1412 STRLEN offset;
1414 SV *sv; 1413 SV *sv;
1415 1414
1415 /* work around bugs in 5.10 where manipulating magic values
1416 * will perl ignore the magic in subsequent accesses
1417 */
1416 SvGETMAGIC (string); 1418 /*SvGETMAGIC (string);*/
1419 if (SvMAGICAL (string))
1420 string = sv_2mortal (newSVsv (string));
1421
1417 SvUPGRADE (string, SVt_PV); 1422 SvUPGRADE (string, SVt_PV);
1418 1423
1419 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1424 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1420 * assertion with -DDEBUGGING, although SvCUR is documented to 1425 * assertion with -DDEBUGGING, although SvCUR is documented to
1421 * return the xpv_cur field which certainly exists after upgrading. 1426 * return the xpv_cur field which certainly exists after upgrading.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines