Add epigraph for 5.31.5

[perl5.git] / reentr.c

diff --git a/reentr.c b/reentr.c
index c464acc..166777e 100644 (file)
--- a/reentr.c
+++ b/reentr.c
@@ -33,6 +33,13 @@
 #include "perl.h"
 #include "reentr.h"
 
+#define RenewDouble(data_pointer, size_pointer, type) \
+    STMT_START { \
+       const size_t size = *(size_pointer) * 2; \
+       Renew((data_pointer), (size), type); \
+       *(size_pointer) = size; \
+    } STMT_END
+
 void
 Perl_reentrant_size(pTHX) {
        PERL_UNUSED_CONTEXT;
@@ -52,16 +59,12 @@ Perl_reentrant_size(pTHX) {
        PL_reentrant_buffer->_grent_size = sysconf(_SC_GETGR_R_SIZE_MAX);
        if (PL_reentrant_buffer->_grent_size == (size_t) -1)
                PL_reentrant_buffer->_grent_size = REENTRANTUSUALSIZE;
-#   else
-#       if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
+#   elif defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
        PL_reentrant_buffer->_grent_size = SIABUFSIZ;
-#       else
-#           ifdef __sgi
+#   elif defined(__sgi)
        PL_reentrant_buffer->_grent_size = BUFSIZ;
-#           else
+#   else
        PL_reentrant_buffer->_grent_size = REENTRANTUSUALSIZE;
-#           endif
-#       endif
 #   endif 
 #endif /* HAS_GETGRNAM_R */
 #ifdef HAS_GETHOSTBYNAME_R
@@ -87,16 +90,12 @@ Perl_reentrant_size(pTHX) {
        PL_reentrant_buffer->_pwent_size = sysconf(_SC_GETPW_R_SIZE_MAX);
        if (PL_reentrant_buffer->_pwent_size == (size_t) -1)
                PL_reentrant_buffer->_pwent_size = REENTRANTUSUALSIZE;
-#   else
-#       if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
+#   elif defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
        PL_reentrant_buffer->_pwent_size = SIABUFSIZ;
-#       else
-#           ifdef __sgi
+#   elif defined(__sgi)
        PL_reentrant_buffer->_pwent_size = BUFSIZ;
-#           else
+#   else
        PL_reentrant_buffer->_pwent_size = REENTRANTUSUALSIZE;
-#           endif
-#       endif
 #   endif 
 #endif /* HAS_GETPWNAM_R */
 #ifdef HAS_GETSERVBYNAME_R
@@ -109,16 +108,12 @@ Perl_reentrant_size(pTHX) {
        PL_reentrant_buffer->_spent_size = sysconf(_SC_GETPW_R_SIZE_MAX);
        if (PL_reentrant_buffer->_spent_size == (size_t) -1)
                PL_reentrant_buffer->_spent_size = REENTRANTUSUALSIZE;
-#   else
-#       if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
+#   elif defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
        PL_reentrant_buffer->_spent_size = SIABUFSIZ;
-#       else
-#           ifdef __sgi
+#   elif defined(__sgi)
        PL_reentrant_buffer->_spent_size = BUFSIZ;
-#           else
+#   else
        PL_reentrant_buffer->_spent_size = REENTRANTUSUALSIZE;
-#           endif
-#       endif
 #   endif 
 #endif /* HAS_GETSPNAM_R */
 #ifdef HAS_READDIR_R
@@ -326,9 +321,8 @@ Perl_reentrant_retry(const char *f, ...)
                PERL_REENTRANT_MAXSIZE / 2)
 #endif
            {
-               PL_reentrant_buffer->_hostent_size *= 2;
-               Renew(PL_reentrant_buffer->_hostent_buffer,
-                     PL_reentrant_buffer->_hostent_size, char);
+               RenewDouble(PL_reentrant_buffer->_hostent_buffer,
+                       &PL_reentrant_buffer->_hostent_size, char);
                switch (PL_op->op_type) {
                case OP_GHBYADDR:
                    p0    = va_arg(ap, void *);
@@ -359,9 +353,8 @@ Perl_reentrant_retry(const char *f, ...)
 #endif
            {
                Gid_t gid;
-               PL_reentrant_buffer->_grent_size *= 2;
-               Renew(PL_reentrant_buffer->_grent_buffer,
-                     PL_reentrant_buffer->_grent_size, char);
+               RenewDouble(PL_reentrant_buffer->_grent_buffer,
+                     &PL_reentrant_buffer->_grent_size, char);
                switch (PL_op->op_type) {
                case OP_GGRNAM:
                    p0 = va_arg(ap, void *);
@@ -394,9 +387,8 @@ Perl_reentrant_retry(const char *f, ...)
 #endif
            {
                Netdb_net_t net;
-               PL_reentrant_buffer->_netent_size *= 2;
-               Renew(PL_reentrant_buffer->_netent_buffer,
-                     PL_reentrant_buffer->_netent_size, char);
+               RenewDouble(PL_reentrant_buffer->_netent_buffer,
+                     &PL_reentrant_buffer->_netent_size, char);
                switch (PL_op->op_type) {
                case OP_GNBYADDR:
                    net = va_arg(ap, Netdb_net_t);
@@ -426,9 +418,8 @@ Perl_reentrant_retry(const char *f, ...)
 #endif
            {
                Uid_t uid;
-               PL_reentrant_buffer->_pwent_size *= 2;
-               Renew(PL_reentrant_buffer->_pwent_buffer,
-                     PL_reentrant_buffer->_pwent_size, char);
+               RenewDouble(PL_reentrant_buffer->_pwent_buffer,
+                     &PL_reentrant_buffer->_pwent_size, char);
                switch (PL_op->op_type) {
                case OP_GPWNAM:
                    p0 = va_arg(ap, void *);
@@ -462,9 +453,8 @@ Perl_reentrant_retry(const char *f, ...)
                PERL_REENTRANT_MAXSIZE / 2)
 #endif
            {
-               PL_reentrant_buffer->_protoent_size *= 2;
-               Renew(PL_reentrant_buffer->_protoent_buffer,
-                     PL_reentrant_buffer->_protoent_size, char);
+               RenewDouble(PL_reentrant_buffer->_protoent_buffer,
+                     &PL_reentrant_buffer->_protoent_size, char);
                switch (PL_op->op_type) {
                case OP_GPBYNAME:
                    p0 = va_arg(ap, void *);
@@ -492,9 +482,8 @@ Perl_reentrant_retry(const char *f, ...)
                PERL_REENTRANT_MAXSIZE / 2)
 #endif
            {
-               PL_reentrant_buffer->_servent_size *= 2;
-               Renew(PL_reentrant_buffer->_servent_buffer,
-                     PL_reentrant_buffer->_servent_size, char);
+               RenewDouble(PL_reentrant_buffer->_servent_buffer,
+                     &PL_reentrant_buffer->_servent_size, char);
                switch (PL_op->op_type) {
                case OP_GSBYNAME:
                    p0 = va_arg(ap, void *);