--- JSON-XS/XS.xs	2007/03/31 14:20:06	1.22
+++ JSON-XS/XS.xs	2007/04/06 21:17:09	1.26
@@ -5,6 +5,11 @@
 #include "assert.h"
 #include "string.h"
 #include "stdlib.h"
+#include "stdio.h"
+
+#if defined(__BORLANDC__) || defined(_MSC_VER)
+# define snprintf _snprintf // C compilers have this in stdio.h
+#endif
 
 #define F_ASCII        0x00000001UL
 #define F_UTF8         0x00000002UL
@@ -23,7 +28,7 @@
 // F_BLESSED?     <=> { $__class__$ => }
 
 #define F_PRETTY    F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
-#define F_DEFAULT   (12UL << S_MAXDEPTH)
+#define F_DEFAULT   (9UL << S_MAXDEPTH)
 
 #define INIT_SIZE   32 // initial scalar size to be allocated
 #define INDENT_STEP 3  // spaces per indentation level
@@ -78,7 +83,10 @@
       return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
     }
   else
-    return (UV)-1;
+    {
+      *clen = (STRLEN)-1;
+      return (UV)-1;
+    }
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -407,7 +415,6 @@
         }
       else
         {
-          SV *sv;
           HE *he = hv_iternext (hv);
 
           for (;;)
@@ -432,9 +439,10 @@
 static void
 encode_rv (enc_t *enc, SV *sv)
 {
-  SvGETMAGIC (sv);
+  svtype svt;
 
-  svtype svt = SvTYPE (sv);
+  SvGETMAGIC (sv);
+  svt = SvTYPE (sv);
 
   if (svt == SVt_PVHV)
     encode_hv (enc, (HV *)sv);
@@ -494,10 +502,11 @@
 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);
@@ -669,39 +678,45 @@
             *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++;
-                }
+                *cur++ = *dec->cur++;
               while (--clen);
 
               utf8 = 1;
             }
-          else if (!ch)
-            ERR ("unexpected end of string while parsing json string");
           else
-            ERR ("invalid character encountered");
+            {
+              --dec->cur;
 
+              if (!ch)
+                ERR ("unexpected end of string while parsing JSON string");
+              else
+                ERR ("invalid character encountered while parsing JSON string");
+            }
         }
       while (cur < buf + SHORT_STRING_LEN);
 
-      STRLEN len = cur - buf;
+      {
+        STRLEN len = cur - buf;
 
-      if (sv)
-        {
-          SvGROW (sv, SvCUR (sv) + len + 1);
-          memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
-          SvCUR_set (sv, SvCUR (sv) + len);
-        }
-      else
-        sv = newSVpvn (buf, len);
+        if (sv)
+          {
+            SvGROW (sv, SvCUR (sv) + len + 1);
+            memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
+            SvCUR_set (sv, SvCUR (sv) + len);
+          }
+        else
+          sv = newSVpvn (buf, len);
+      }
     }
   while (*dec->cur != '"');
 
@@ -955,7 +970,7 @@
         break;
 
       default:
-        ERR ("malformed json string, neither array, object, number, string or atom");
+        ERR ("malformed JSON string, neither array, object, number, string or atom");
         break;
     }
 
@@ -966,6 +981,7 @@
 static SV *
 decode_json (SV *string, U32 flags)
 {
+  dec_t dec;
   SV *sv;
 
   SvUPGRADE (string, SVt_PV);
@@ -977,7 +993,6 @@
 
   SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
 
-  dec_t dec;
   dec.flags    = flags;
   dec.cur      = SvPVX (string);
   dec.end      = SvEND (string);
@@ -1004,7 +1019,7 @@
       pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
       LEAVE;
 
-      croak ("%s, at character offset %d (%s)",
+      croak ("%s, at character offset %d [\"%s\"]",
              dec.err,
              (int)offset,
              dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
@@ -1071,7 +1086,7 @@
 	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);