Skip to content

Commit

Permalink
Restored the signature of Encode_XSEncoding() to address RT#94478
Browse files Browse the repository at this point in the history
  • Loading branch information
@dankogai
dankogai committed Apr 6, 2014
1 parent a8e88b0 commit f015cd2
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 22 deletions.
4 changes: 2 additions & 2 deletions Byte/Makefile.PL
View file
Expand Up @@ -114,15 +114,15 @@ END
print XS <<"END";
static void
Encode_XSEncoding(pTHX_ encode_t *enc, char *name)
Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])
Expand Down
4 changes: 2 additions & 2 deletions CN/Makefile.PL
View file
Expand Up @@ -90,15 +90,15 @@ END
print XS <<"END";
static void
Encode_XSEncoding(pTHX_ encode_t *enc, char *name)
Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])
Expand Down
4 changes: 2 additions & 2 deletions EBCDIC/Makefile.PL
View file
Expand Up @@ -71,15 +71,15 @@ END
print XS <<"END";
static void
Encode_XSEncoding(pTHX_ encode_t *enc, char *name)
Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])
Expand Down
3 changes: 2 additions & 1 deletion Encode.pm
View file
Expand Up @@ -4,7 +4,8 @@
package Encode;
use strict;
use warnings;
our $VERSION = sprintf "%d.%02d", q$Revision: 2.58 $ =~ /(\d+)/g;
#our $VERSION = sprintf "%d.%02d", q$Revision: 2.58 $ =~ /(\d+)/g;
our $VERSION = "2.58_01";
use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
use XSLoader ();
XSLoader::load( __PACKAGE__, $VERSION );
Expand Down
4 changes: 2 additions & 2 deletions Encode.xs
View file
Expand Up @@ -41,15 +41,15 @@ UNIMPLEMENTED(_encoded_bytes_to_utf8, I32)
UTF8_ALLOW_LONG))

void
Encode_XSEncoding(pTHX_ encode_t * enc, char * name)
Encode_XSEncoding(pTHX_ encode_t * enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i]) {
Expand Down
4 changes: 2 additions & 2 deletions Encode/Makefile_PL.e2x
View file
Expand Up @@ -107,15 +107,15 @@ END
print XS <<"END";

static void
Encode_XSEncoding(pTHX_ encode_t *enc, char *name)
Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])
Expand Down
4 changes: 2 additions & 2 deletions JP/Makefile.PL
View file
Expand Up @@ -90,15 +90,15 @@ END
print XS <<"END";
static void
Encode_XSEncoding(pTHX_ encode_t *enc, char *name)
Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])
Expand Down
4 changes: 2 additions & 2 deletions KR/Makefile.PL
View file
Expand Up @@ -88,15 +88,15 @@ END
print XS <<"END";
static void
Encode_XSEncoding(pTHX_ encode_t *enc, char *name)
Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])
Expand Down
4 changes: 2 additions & 2 deletions Symbol/Makefile.PL
View file
Expand Up @@ -76,15 +76,15 @@ END
print XS <<"END";
static void
Encode_XSEncoding(pTHX_ encode_t *enc, char *name)
Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])
Expand Down
4 changes: 2 additions & 2 deletions TW/Makefile.PL
View file
Expand Up @@ -86,15 +86,15 @@ END
print XS <<"END";
static void
Encode_XSEncoding(pTHX_ encode_t *enc, char *name)
Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])
Expand Down
6 changes: 3 additions & 3 deletions bin/enc2xs
View file
Expand Up @@ -301,7 +301,7 @@ if ($doC)
my $sym = "${enc}_encoding";
$sym =~ s/\W+/_/g;
print H "extern encode_t $sym;\n";
print D " Encode_XSEncoding(aTHX_ &$sym, \"$sym\");\n";
print D " Encode_XSEncoding(aTHX_ &$sym);\n";
}

if ($cname =~ /(\w+)\.xs$/)
Expand All @@ -310,15 +310,15 @@ if ($doC)
print C <<'END';
static void
Encode_XSEncoding(pTHX_ encode_t *enc, char *name)
Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
SV *iv = newSViv(PTR2IV(enc));
SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
SvFLAGS(iv) |= SVp_POK;
SvPVX(iv) = name;
SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])
Expand Down

0 comments on commit f015cd2

Please sign in to comment.