Change 29965 by [EMAIL PROTECTED] on 2007/01/25 00:07:28
Integrate:
[ 28031]
Perl_pack_cat() is a mathom too!
Affected files ...
... //depot/maint-5.8/perl/mathoms.c#22 integrate
... //depot/maint-5.8/perl/pod/perlapi.pod#89 integrate
... //depot/maint-5.8/perl/pp_pack.c#49 integrate
Differences ...
==== //depot/maint-5.8/perl/mathoms.c#22 (text) ====
Index: perl/mathoms.c
--- perl/mathoms.c#21~29955~ 2007-01-24 10:58:36.000000000 -0800
+++ perl/mathoms.c 2007-01-24 16:07:28.000000000 -0800
@@ -1248,6 +1248,24 @@
return unpackstring(pat, patend, s, strend, flags);
}
+/*
+=for apidoc pack_cat
+
+The engine implementing pack() Perl function. Note: parameters next_in_list and
+flags are not used. This call should not be used; use packlist instead.
+
+=cut
+*/
+
+void
+Perl_pack_cat(pTHX_ SV *cat, char *pat, char *patend, register SV **beglist,
SV **endlist, SV ***next_in_list, U32 flags)
+{
+ PERL_UNUSED_ARG(next_in_list);
+ PERL_UNUSED_ARG(flags);
+
+ packlist(cat, pat, patend, beglist, endlist);
+}
+
/* Whilst this should really be STATIC, it was not in 5.8.7, hence something
may have linked against it. */
S_vdie_common(pTHX_ const char *message, STRLEN msglen, I32 utf8)
==== //depot/maint-5.8/perl/pod/perlapi.pod#89 (text+w) ====
Index: perl/pod/perlapi.pod
--- perl/pod/perlapi.pod#88~29955~ 2007-01-24 10:58:36.000000000 -0800
+++ perl/pod/perlapi.pod 2007-01-24 16:07:28.000000000 -0800
@@ -763,6 +763,17 @@
=for hackers
Found in file mathoms.c
+=item pack_cat
+X<pack_cat>
+
+The engine implementing pack() Perl function. Note: parameters next_in_list and
+flags are not used. This call should not be used; use packlist instead.
+
+ void pack_cat(SV *cat, const char *pat, const char *patend, SV
**beglist, SV **endlist, SV ***next_in_list, U32 flags)
+
+=for hackers
+Found in file mathoms.c
+
=item sv_2pvbyte_nolen
X<sv_2pvbyte_nolen>
@@ -1030,17 +1041,6 @@
=for hackers
Found in file pp_pack.c
-=item pack_cat
-X<pack_cat>
-
-The engine implementing pack() Perl function. Note: parameters next_in_list and
-flags are not used. This call should not be used; use packlist instead.
-
- void pack_cat(SV *cat, char *pat, char *patend, SV **beglist, SV
**endlist, SV ***next_in_list, U32 flags)
-
-=for hackers
-Found in file pp_pack.c
-
=item unpackstring
X<unpackstring>
==== //depot/maint-5.8/perl/pp_pack.c#49 (text) ====
Index: perl/pp_pack.c
--- perl/pp_pack.c#48~29964~ 2007-01-24 15:53:28.000000000 -0800
+++ perl/pp_pack.c 2007-01-24 16:07:28.000000000 -0800
@@ -2448,29 +2448,6 @@
}
/*
-=for apidoc pack_cat
-
-The engine implementing pack() Perl function. Note: parameters next_in_list and
-flags are not used. This call should not be used; use packlist instead.
-
-=cut */
-
-
-void
-Perl_pack_cat(pTHX_ SV *cat, char *pat, char *patend, register SV **beglist,
- SV **endlist, SV ***next_in_list, U32 flags)
-{
- tempsym_t sym;
- PERL_UNUSED_ARG(next_in_list);
- PERL_UNUSED_ARG(flags);
-
- TEMPSYM_INIT(&sym, pat, patend, FLAG_PACK);
-
- (void)pack_rec( cat, &sym, beglist, endlist );
-}
-
-
-/*
=for apidoc packlist
The engine implementing pack() Perl function.
End of Patch.
