Change 13883 by jhi@alpha on 2001/12/25 15:56:49
Subject: Re: Not OK 13881
From: John Peacock <[EMAIL PROTECTED]>
Date: Tue, 25 Dec 2001 06:02:12 -0500
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/embed.h#319 edit
.... //depot/perl/embed.pl#309 edit
.... //depot/perl/global.sym#195 edit
.... //depot/perl/pod/perlapi.pod#118 edit
.... //depot/perl/util.c#307 edit
Differences ...
==== //depot/perl/embed.h#319 (text+w) ====
Index: perl/embed.h
--- perl/embed.h.~1~ Tue Dec 25 09:00:05 2001
+++ perl/embed.h Tue Dec 25 09:00:05 2001
@@ -1203,6 +1203,9 @@
#define sv_pvn_force_flags Perl_sv_pvn_force_flags
#define sv_2pv_flags Perl_sv_2pv_flags
#define my_atof2 Perl_my_atof2
+#if !defined(HAS_SOCKETPAIR) && defined(HAS_SOCKET)
+#define my_socketpair Perl_my_socketpair
+#endif
#if defined(USE_PERLIO) && !defined(USE_SFIO)
#define PerlIO_close Perl_PerlIO_close
#define PerlIO_fill Perl_PerlIO_fill
@@ -2741,6 +2744,9 @@
#define sv_pvn_force_flags(a,b,c) Perl_sv_pvn_force_flags(aTHX_ a,b,c)
#define sv_2pv_flags(a,b,c) Perl_sv_2pv_flags(aTHX_ a,b,c)
#define my_atof2(a,b) Perl_my_atof2(aTHX_ a,b)
+#if !defined(HAS_SOCKETPAIR) && defined(HAS_SOCKET)
+#define my_socketpair(a,b,c,d) Perl_my_socketpair(aTHX_ a,b,c,d)
+#endif
#if defined(USE_PERLIO) && !defined(USE_SFIO)
#define PerlIO_close(a) Perl_PerlIO_close(aTHX_ a)
#define PerlIO_fill(a) Perl_PerlIO_fill(aTHX_ a)
==== //depot/perl/embed.pl#309 (xtext) ====
Index: perl/embed.pl
--- perl/embed.pl.~1~ Tue Dec 25 09:00:05 2001
+++ perl/embed.pl Tue Dec 25 09:00:05 2001
@@ -1277,7 +1277,7 @@
#endif
p |OP* |force_list |OP* arg
p |OP* |fold_constants |OP* arg
-Afp |char* |form |const char* pat|...
+Afpd |char* |form |const char* pat|...
Ap |char* |vform |const char* pat|va_list* args
Ap |void |free_tmps
p |OP* |gen_constant_list|OP* o
==== //depot/perl/global.sym#195 (text+w) ====
Index: perl/global.sym
--- perl/global.sym.~1~ Tue Dec 25 09:00:05 2001
+++ perl/global.sym Tue Dec 25 09:00:05 2001
@@ -604,6 +604,7 @@
Perl_sv_pvn_force_flags
Perl_sv_2pv_flags
Perl_my_atof2
+Perl_my_socketpair
Perl_PerlIO_close
Perl_PerlIO_fill
Perl_PerlIO_fileno
==== //depot/perl/pod/perlapi.pod#118 (text+w) ====
Index: perl/pod/perlapi.pod
--- perl/pod/perlapi.pod.~1~ Tue Dec 25 09:00:05 2001
+++ perl/pod/perlapi.pod Tue Dec 25 09:00:05 2001
@@ -465,6 +465,26 @@
=for hackers
Found in file util.c
+=item form
+
+Takes a sprintf-style format pattern and conventional
+(non-SV) arguments and returns the formatted string.
+
+ (char *) Perl_form(pTHX_ const char* pat, ...)
+
+can be used any place a string (char *) is required:
+
+ char * s = Perl_form("%d.%d",major,minor);
+
+Uses a single private buffer so if you want to format several strings you
+must explicitly copy the earlier strings away (and free the copies when you
+are done).
+
+ char* form(const char* pat, ...)
+
+=for hackers
+Found in file util.c
+
=item FREETMPS
Closing bracket for temporaries on a callback. See C<SAVETMPS> and
@@ -1420,17 +1440,6 @@
=for hackers
Found in file sv.c
-=item newSV
-
-Create a new null SV, or if len > 0, create a new empty SVt_PV type SV
-with an initial PV allocation of len+1. Normally accessed via the C<NEWSV>
-macro.
-
- SV* newSV(STRLEN len)
-
-=for hackers
-Found in file sv.c
-
=item NEWSV
Creates a new SV. A non-zero C<len> parameter indicates the number of
@@ -1444,6 +1453,17 @@
=for hackers
Found in file handy.h
+=item newSV
+
+Create a new null SV, or if len > 0, create a new empty SVt_PV type SV
+with an initial PV allocation of len+1. Normally accessed via the C<NEWSV>
+macro.
+
+ SV* newSV(STRLEN len)
+
+=for hackers
+Found in file sv.c
+
=item newSViv
Creates a new SV and copies an integer into it. The reference count for the
@@ -2996,22 +3016,22 @@
=for hackers
Found in file sv.h
-=item SvUVX
+=item SvUVx
-Returns the raw value in the SV's UV slot, without checks or conversions.
-Only use when you are sure SvIOK is true. See also C<SvUV()>.
+Coerces the given SV to an unsigned integer and returns it. Guarantees to
+evaluate sv only once. Use the more efficient C<SvUV> otherwise.
- UV SvUVX(SV* sv)
+ UV SvUVx(SV* sv)
=for hackers
Found in file sv.h
-=item SvUVx
+=item SvUVX
-Coerces the given SV to an unsigned integer and returns it. Guarantees to
-evaluate sv only once. Use the more efficient C<SvUV> otherwise.
+Returns the raw value in the SV's UV slot, without checks or conversions.
+Only use when you are sure SvIOK is true. See also C<SvUV()>.
- UV SvUVx(SV* sv)
+ UV SvUVX(SV* sv)
=for hackers
Found in file sv.h
==== //depot/perl/util.c#307 (text) ====
Index: perl/util.c
--- perl/util.c.~1~ Tue Dec 25 09:00:05 2001
+++ perl/util.c Tue Dec 25 09:00:05 2001
@@ -948,6 +948,25 @@
}
#endif /* PERL_IMPLICIT_CONTEXT */
+/*
+=for apidoc form
+
+Takes a sprintf-style format pattern and conventional
+(non-SV) arguments and returns the formatted string.
+
+ (char *) Perl_form(pTHX_ const char* pat, ...)
+
+can be used any place a string (char *) is required:
+
+ char * s = Perl_form("%d.%d",major,minor);
+
+Uses a single private buffer so if you want to format several strings you
+must explicitly copy the earlier strings away (and free the copies when you
+are done).
+
+=cut
+*/
+
char *
Perl_form(pTHX_ const char* pat, ...)
{
End of Patch.
