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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.50 by root, Thu Feb 25 02:29:22 2016 UTC vs.
Revision 1.51 by root, Sun Apr 24 13:15:19 2016 UTC

 #define F_SHRINK          0x00000001UL
 #define F_ALLOW_UNKNOWN   0x00000002UL
 #define F_ALLOW_SHARING   0x00000004UL
 #define F_ALLOW_CYCLES    0x00000008UL
 #define F_PACK_STRINGS    0x00000010UL
+#define F_UTF8_STRINGS    0x00000020UL
-#define F_VALIDATE_UTF8   0x00000020UL
+#define F_VALIDATE_UTF8   0x00000040UL
 #define INIT_SIZE   32 // initial scalar size to be allocated
 #define SB do {
 #define SE } while (0)
 }
 ecb_inline void
 encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
 {
+  if (ecb_expect_false (enc->cbor.flags & F_UTF8_STRINGS))
+    if (!utf8)
+      {
+        SV *sv = sv_newmortal ();
+        char *s; STRLEN l;
+        sv_setpvn (sv, str, len);
+        s = SvPVutf8 (sv, l);
+        encode_str (enc, 1, s, l);
+        return;
+      }
   encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
   need (enc, len);
   memcpy (enc->cur, str, len);
   enc->cur += len;
 }
         shrink          = F_SHRINK
         allow_unknown   = F_ALLOW_UNKNOWN
         allow_sharing   = F_ALLOW_SHARING
         allow_cycles    = F_ALLOW_CYCLES
         pack_strings    = F_PACK_STRINGS
+        utf8_strings    = F_UTF8_STRINGS
         validate_utf8   = F_VALIDATE_UTF8
 	PPCODE:
 {
         if (enable)
           self->flags |=  ix;

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