Encode API documentation nd tidy up.

Minor additions to test.
Tweaks sv_utf8_upgrade() to force SvPV, and always SvUTF8_on and return length.
Adds STRLEN to standard typemap.

p4raw-id: //depot/perlio@8923

1 files changed, 8 insertions, 93 deletions

diff --git a/ext/Encode/Encode.xs b/ext/Encode/Encode.xs
index 8aa51ff33d..3913fafb48 100644
--- a/ext/Encode/Encode.xs
+++ b/ext/Encode/Encode.xs
@@ -453,7 +453,7 @@ bool
 sv_utf8_decode(sv)
 SV *	sv
 
-void
+STRLEN
 sv_utf8_upgrade(sv)
 SV *	sv
 
@@ -584,88 +584,16 @@ _utf8_to_bytes(sv, ...)
       OUTPUT:
 	RETVAL
 
-SV *
-_chars_to_utf8(sv, from, ...)
-	SV *	sv
-	SV *	from
-      CODE:
-	{
-	  SV * check = items == 3 ? ST(2) : Nullsv;
-	  RETVAL = &PL_sv_undef;
-	}
-      OUTPUT:
-	RETVAL
-
-SV *
-_utf8_to_chars(sv, to, ...)
-	SV *	sv
-	SV *	to
-      CODE:
-	{
-	  SV * check = items == 3 ? ST(2) : Nullsv;
-	  RETVAL = &PL_sv_undef;
-	}
-      OUTPUT:
-	RETVAL
-
-SV *
-_utf8_to_chars_check(sv, ...)
-	SV *	sv
-      CODE:
-	{
-	  SV * check = items == 2 ? ST(1) : Nullsv;
-	  RETVAL = &PL_sv_undef;
-	}
-      OUTPUT:
-	RETVAL
-
-SV *
-_bytes_to_chars(sv, from, ...)
-	SV *	sv
-	SV *	from
-      CODE:
-	{
-	  SV * check = items == 3 ? ST(2) : Nullsv;
-	  RETVAL = &PL_sv_undef;
-	}
-      OUTPUT:
-	RETVAL
-
-SV *
-_chars_to_bytes(sv, to, ...)
-	SV *	sv
-	SV *	to
-      CODE:
-	{
-	  SV * check = items == 3 ? ST(2) : Nullsv;
-	  RETVAL = &PL_sv_undef;
-	}
-      OUTPUT:
-	RETVAL
-
-SV *
-_from_to(sv, from, to, ...)
-	SV *	sv
-	SV *	from
-	SV *	to
-      CODE:
-	{
-	  SV * check = items == 4 ? ST(3) : Nullsv;
-	  RETVAL = &PL_sv_undef;
-	}
-      OUTPUT:
-	RETVAL
-
 bool
-_is_utf8(sv, ...)
-	SV *	sv
+is_utf8(sv, check = FALSE)
+SV *	sv
+bool	check
       CODE:
 	{
-	  SV *	check = items == 2 ? ST(1) : Nullsv;
 	  if (SvPOK(sv)) {
-	    RETVAL = SvUTF8(sv) ? 1 : 0;
+	    RETVAL = SvUTF8(sv) ? TRUE : FALSE;
 	    if (RETVAL &&
-		SvTRUE(check) &&
+		check  &&
 		!is_utf8_string((U8*)SvPVX(sv), SvCUR(sv)))
 	      RETVAL = FALSE;
 	  } else {
@@ -676,7 +604,7 @@ _is_utf8(sv, ...)
 	RETVAL
 
 SV *
-_on_utf8(sv)
+_utf8_on(sv)
 	SV *	sv
       CODE:
 	{
@@ -692,7 +620,7 @@ _on_utf8(sv)
 	RETVAL
 
 SV *
-_off_utf8(sv)
+_utf8_off(sv)
 	SV *	sv
       CODE:
 	{
@@ -707,19 +635,6 @@ _off_utf8(sv)
       OUTPUT:
 	RETVAL
 
-SV *
-_utf_to_utf(sv, from, to, ...)
-	SV *	sv
-	SV *	from
-	SV *	to
-      CODE:
-	{
-	  SV * check = items == 4 ? ST(3) : Nullsv;
-	  RETVAL = &PL_sv_undef;
-	}
-      OUTPUT:
-	RETVAL
-
 BOOT:
 {
 #ifdef USE_PERLIO