summaryrefslogtreecommitdiff
path: root/ext/Encode/Encode.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@gmail.com>2003-12-29 08:10:51 +0000
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2003-12-29 08:10:51 +0000
commitc2cbba7db7fc4081c5d985a6a15c29dded8e6709 (patch)
tree263a9b5aebae6455a42197e45fec200756a7f109 /ext/Encode/Encode.pm
parent05e23382578645af97ac24028ac1e015aa95cf1d (diff)
downloadperl-c2cbba7db7fc4081c5d985a6a15c29dded8e6709.tar.gz
Upgrade to Encode 1.99.
p4raw-id: //depot/perl@21991
Diffstat (limited to 'ext/Encode/Encode.pm')
-rw-r--r--ext/Encode/Encode.pm16
1 files changed, 10 insertions, 6 deletions
diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm
index 043337b885..fe1a342245 100644
--- a/ext/Encode/Encode.pm
+++ b/ext/Encode/Encode.pm
@@ -1,9 +1,9 @@
#
-# $Id: Encode.pm,v 1.98 2003/08/20 11:16:34 dankogai Exp dankogai $
+# $Id: Encode.pm,v 1.99 2003/12/29 02:47:16 dankogai Exp dankogai $
#
package Encode;
use strict;
-our $VERSION = do { my @r = (q$Revision: 1.9801 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.99 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
sub DEBUG () { 0 }
use XSLoader ();
XSLoader::load(__PACKAGE__, $VERSION);
@@ -195,11 +195,15 @@ sub encode_utf8($)
return $str;
}
-sub decode_utf8($)
+sub decode_utf8($;$)
{
- my ($str) = @_;
- return undef unless utf8::decode($str);
- return $str;
+ my ($str, $check) = @_;
+ if ($check){
+ return decode("utf8", $str, $check);
+ }else{
+ return undef unless utf8::decode($str);
+ return $str;
+ }
}
predefine_encodings(1);