|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
From cb69e201f5e1107e6aa75799b29cf52a91b94922 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 8a46c1a9758a359755d2f33f641a264c6d3c69a0 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
|
|
Date: Tue, 29 Sep 2015 10:31:58 +0200
|
|
|
|
|
Subject: [PATCH] Cast char* and U8* where needed
|
|
|
|
@ -15,10 +15,10 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/XS.xs b/XS.xs
|
|
|
|
|
index ab487f9..e413936 100644
|
|
|
|
|
index c46a5e7..56223bd 100644
|
|
|
|
|
--- a/XS.xs
|
|
|
|
|
+++ b/XS.xs
|
|
|
|
|
@@ -767,7 +767,7 @@ decode_he (dec_t *dec, HV *hv)
|
|
|
|
|
@@ -770,7 +770,7 @@ decode_he (dec_t *dec, HV *hv)
|
|
|
|
|
dec->cur += len;
|
|
|
|
|
|
|
|
|
|
if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
|
|
|
|
@ -27,7 +27,7 @@ index ab487f9..e413936 100644
|
|
|
|
|
ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
|
|
|
|
|
|
|
|
|
|
hv_store (hv, key, -len, decode_sv (dec), 0);
|
|
|
|
|
@@ -856,7 +856,7 @@ decode_str (dec_t *dec, int utf8)
|
|
|
|
|
@@ -859,7 +859,7 @@ decode_str (dec_t *dec, int utf8)
|
|
|
|
|
STRLEN len = decode_uint (dec);
|
|
|
|
|
|
|
|
|
|
WANT (len);
|
|
|
|
@ -36,7 +36,7 @@ index ab487f9..e413936 100644
|
|
|
|
|
dec->cur += len;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -865,7 +865,7 @@ decode_str (dec_t *dec, int utf8)
|
|
|
|
|
@@ -868,7 +868,7 @@ decode_str (dec_t *dec, int utf8)
|
|
|
|
|
STRLEN len = decode_uint (dec);
|
|
|
|
|
|
|
|
|
|
WANT (len);
|
|
|
|
@ -45,7 +45,7 @@ index ab487f9..e413936 100644
|
|
|
|
|
dec->cur += len;
|
|
|
|
|
|
|
|
|
|
if (ecb_expect_false (dec->stringref)
|
|
|
|
|
@@ -876,7 +876,7 @@ decode_str (dec_t *dec, int utf8)
|
|
|
|
|
@@ -879,7 +879,7 @@ decode_str (dec_t *dec, int utf8)
|
|
|
|
|
if (utf8)
|
|
|
|
|
{
|
|
|
|
|
if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
|
|
|
|
@ -54,7 +54,7 @@ index ab487f9..e413936 100644
|
|
|
|
|
ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
|
|
|
|
|
|
|
|
|
|
SvUTF8_on (sv);
|
|
|
|
|
@@ -1183,7 +1183,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return)
|
|
|
|
|
@@ -1189,7 +1189,7 @@ decode_cbor (SV *string, CBOR *cbor, char **offset_return)
|
|
|
|
|
sv = decode_sv (&dec);
|
|
|
|
|
|
|
|
|
|
if (offset_return)
|
|
|
|
@ -63,7 +63,7 @@ index ab487f9..e413936 100644
|
|
|
|
|
|
|
|
|
|
if (!(offset_return || !sv))
|
|
|
|
|
if (dec.cur != dec.end && !dec.err)
|
|
|
|
|
@@ -1233,7 +1233,7 @@ incr_parse (CBOR *self, SV *cborstr)
|
|
|
|
|
@@ -1239,7 +1239,7 @@ incr_parse (CBOR *self, SV *cborstr)
|
|
|
|
|
1, 2, 4, 8,-1,-1,-1,-2
|
|
|
|
|
};
|
|
|
|
|
|