[ViewVC] Diff of: cvs/JSON-XS/XS.xs

Comparing JSON-XS/XS.xs (file contents):
Revision 1.24 by root, Tue Apr 3 23:59:04 2007 UTC vs.
Revision 1.25 by root, Fri Apr 6 20:37:22 2007 UTC

           encode_nl (enc);
         }
       else
         {
-          SV *sv;
           HE *he = hv_iternext (hv);
           for (;;)
             {
               encode_indent (enc);
 // encode objects, arrays and special \0=false and \1=true values.
 static void
 encode_rv (enc_t *enc, SV *sv)
 {
+  svtype svt;
   SvGETMAGIC (sv);
-  svtype svt = SvTYPE (sv);
+  svt = SvTYPE (sv);
   if (svt == SVt_PVHV)
     encode_hv (enc, (HV *)sv);
   else if (svt == SVt_PVAV)
     encode_av (enc, (AV *)sv);
 }
 static SV *
 encode_json (SV *scalar, U32 flags)
 {
+  enc_t enc;
   if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
     croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
-  enc_t enc;
   enc.flags     = flags;
   enc.sv        = sv_2mortal (NEWSV (0, INIT_SIZE));
   enc.cur       = SvPVX (enc.sv);
   enc.end       = SvEND (enc.sv);
   enc.indent    = 0;
             }
           else if (ch >= 0x20 && ch <= 0x7f)
             *cur++ = ch;
           else if (ch >= 0x80)
             {
+              STRLEN clen;
+              UV uch;
               --dec->cur;
-              STRLEN clen;
-              UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
+              uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
               if (clen == (STRLEN)-1)
                 ERR ("malformed UTF-8 character in JSON string");
               do
                 *cur++ = *dec->cur++;
                 ERR ("invalid character encountered while parsing JSON string");
             }
         }
       while (cur < buf + SHORT_STRING_LEN);
+      {
-      STRLEN len = cur - buf;
+        STRLEN len = cur - buf;
-      if (sv)
+        if (sv)
-        {
+          {
-          SvGROW (sv, SvCUR (sv) + len + 1);
+            SvGROW (sv, SvCUR (sv) + len + 1);
-          memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
+            memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
-          SvCUR_set (sv, SvCUR (sv) + len);
+            SvCUR_set (sv, SvCUR (sv) + len);
-        }
+          }
-      else
+        else
-        sv = newSVpvn (buf, len);
+          sv = newSVpvn (buf, len);
+      }
     }
   while (*dec->cur != '"');
   ++dec->cur;
 }
 static SV *
 decode_json (SV *string, U32 flags)
 {
+  dec_t dec;
   SV *sv;
   SvUPGRADE (string, SVt_PV);
   if (flags & F_UTF8)
   else
     sv_utf8_upgrade (string);
   SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
-  dec_t dec;
   dec.flags    = flags;
   dec.cur      = SvPVX (string);
   dec.end      = SvEND (string);
   dec.err      = 0;
   dec.depth    = 0;
         RETVAL = newSVsv (self);
 }
 	OUTPUT:
         RETVAL
-SV *max_depth (SV *self, int max_depth = 0x80000000UL)
+SV *max_depth (SV *self, UV max_depth = 0x80000000UL)
 	CODE:
 {
   	UV *uv = SvJSON (self);
         UV log2 = 0;

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.24 by root, Tue Apr 3 23:59:04 2007 UTC vs. Revision 1.25 by root, Fri Apr 6 20:37:22 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.24 by root, Tue Apr 3 23:59:04 2007 UTC vs.
Revision 1.25 by root, Fri Apr 6 20:37:22 2007 UTC