This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in reference
[perl5.git]
/
reentr.c
diff --git
a/reentr.c
b/reentr.c
index
96fce3c
..
8d9ab2a
100644
(file)
--- a/
reentr.c
+++ b/
reentr.c
@@
-2,7
+2,7
@@
*
* reentr.c
*
*
* reentr.c
*
- * Copyright (C) 2002, 2003, 2005, 2006 by Larry Wall and others
+ * Copyright (C) 2002, 2003, 2005, 2006
, 2007
by Larry Wall and others
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
@@
-115,10
+115,6
@@
Perl_reentrant_size(pTHX) {
# endif
# endif
#endif /* HAS_GETSPNAM_R */
# endif
# endif
#endif /* HAS_GETSPNAM_R */
-#ifdef HAS_GMTIME_R
-#endif /* HAS_GMTIME_R */
-#ifdef HAS_LOCALTIME_R
-#endif /* HAS_LOCALTIME_R */
#ifdef HAS_RANDOM_R
#endif /* HAS_RANDOM_R */
#ifdef HAS_READDIR_R
#ifdef HAS_RANDOM_R
#endif /* HAS_RANDOM_R */
#ifdef HAS_READDIR_R
@@
-205,10
+201,6
@@
Perl_reentrant_init(pTHX) {
# endif
Newx(PL_reentrant_buffer->_spent_buffer, PL_reentrant_buffer->_spent_size, char);
#endif /* HAS_GETSPNAM_R */
# endif
Newx(PL_reentrant_buffer->_spent_buffer, PL_reentrant_buffer->_spent_size, char);
#endif /* HAS_GETSPNAM_R */
-#ifdef HAS_GMTIME_R
-#endif /* HAS_GMTIME_R */
-#ifdef HAS_LOCALTIME_R
-#endif /* HAS_LOCALTIME_R */
#ifdef HAS_RANDOM_R
#endif /* HAS_RANDOM_R */
#ifdef HAS_READDIR_R
#ifdef HAS_RANDOM_R
#endif /* HAS_RANDOM_R */
#ifdef HAS_READDIR_R
@@
-280,10
+272,6
@@
Perl_reentrant_free(pTHX) {
#ifdef HAS_GETSPNAM_R
Safefree(PL_reentrant_buffer->_spent_buffer);
#endif /* HAS_GETSPNAM_R */
#ifdef HAS_GETSPNAM_R
Safefree(PL_reentrant_buffer->_spent_buffer);
#endif /* HAS_GETSPNAM_R */
-#ifdef HAS_GMTIME_R
-#endif /* HAS_GMTIME_R */
-#ifdef HAS_LOCALTIME_R
-#endif /* HAS_LOCALTIME_R */
#ifdef HAS_RANDOM_R
#endif /* HAS_RANDOM_R */
#ifdef HAS_READDIR_R
#ifdef HAS_RANDOM_R
#endif /* HAS_RANDOM_R */
#ifdef HAS_READDIR_R
@@
-313,6
+301,14
@@
Perl_reentrant_retry(const char *f, ...)
{
dTHX;
void *retptr = NULL;
{
dTHX;
void *retptr = NULL;
+ va_list ap;
+#ifdef USE_REENTRANT_API
+ /* Easier to special case this here than in embed.pl. (Look at what it
+ generates for proto.h) */
+ PERL_ARGS_ASSERT_REENTRANT_RETRY;
+#endif
+ va_start(ap, f);
+ {
#ifdef USE_REENTRANT_API
# if defined(USE_HOSTENT_BUFFER) || defined(USE_GRENT_BUFFER) || defined(USE_NETENT_BUFFER) || defined(USE_PWENT_BUFFER) || defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
void *p0;
#ifdef USE_REENTRANT_API
# if defined(USE_HOSTENT_BUFFER) || defined(USE_GRENT_BUFFER) || defined(USE_NETENT_BUFFER) || defined(USE_PWENT_BUFFER) || defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
void *p0;
@@
-326,9
+322,6
@@
Perl_reentrant_retry(const char *f, ...)
# if defined(USE_HOSTENT_BUFFER) || defined(USE_NETENT_BUFFER) || defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
int anint;
# endif
# if defined(USE_HOSTENT_BUFFER) || defined(USE_NETENT_BUFFER) || defined(USE_PROTOENT_BUFFER) || defined(USE_SERVENT_BUFFER)
int anint;
# endif
- va_list ap;
-
- va_start(ap, f);
switch (PL_op->op_type) {
#ifdef USE_HOSTENT_BUFFER
switch (PL_op->op_type) {
#ifdef USE_HOSTENT_BUFFER
@@
-531,11
+524,11
@@
Perl_reentrant_retry(const char *f, ...)
/* Not known how to retry, so just fail. */
break;
}
/* Not known how to retry, so just fail. */
break;
}
-
- va_end(ap);
#else
PERL_UNUSED_ARG(f);
#endif
#else
PERL_UNUSED_ARG(f);
#endif
+ }
+ va_end(ap);
return retptr;
}
return retptr;
}