This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
reentr.[ch]: White-space only
[perl5.git] / reentr.c
index 881bd87..9b562e5 100644 (file)
--- a/reentr.c
+++ b/reentr.c
@@ -1,17 +1,31 @@
-/*
+/* -*- buffer-read-only: t -*-
+ *
  *    reentr.c
  *
- *    Copyright (C) 2002, 2003, 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.
  *
- *  !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
- *  This file is built by reentrl.pl from data in reentr.pl.
- *
+ * !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
+ * This file is built by regen/reentr.pl from data in regen/reentr.pl.
+ * Any changes made here will be lost!
+ */
+
+/*
  * "Saruman," I said, standing away from him, "only one hand at a time can
  *  wield the One, and you know that well, so do not trouble to say we!"
  *
+ *     [p.260 of _The Lord of the Rings_, II/ii: "The Council of Elrond"]
+ */
+
+/*
+ * This file contains a collection of automatically created wrappers
+ * (created by running reentr.pl) for reentrant (thread-safe) versions of
+ * various library calls, such as getpwent_r.  The wrapping is done so
+ * that other files like pp_sys.c calling those library functions need not
+ * care about the differences between various platforms' idiosyncrasies
+ * regarding these reentrant interfaces.
  */
 
 #include "EXTERN.h"
 #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;
+
+        /* Set the sizes of the reentrant buffers */
+
 #ifdef USE_REENTRANT_API
-#define REENTRANTSMALLSIZE      256    /* Make something up. */
-#define REENTRANTUSUALSIZE     4096    /* Make something up. */
-#ifdef HAS_ASCTIME_R
+#  define REENTRANTSMALLSIZE    256    /* Make something up. */
+#  define REENTRANTUSUALSIZE   4096    /* Make something up. */
+
+#  ifdef HAS_ASCTIME_R
        PL_reentrant_buffer->_asctime_size = REENTRANTSMALLSIZE;
-#endif /* HAS_ASCTIME_R */
-#ifdef HAS_CRYPT_R
-#endif /* HAS_CRYPT_R */
-#ifdef HAS_CTIME_R
+#  endif /* HAS_ASCTIME_R */
+
+#  ifdef HAS_CRYPT_R
+#  endif /* HAS_CRYPT_R */
+
+#  ifdef HAS_CTIME_R
        PL_reentrant_buffer->_ctime_size = REENTRANTSMALLSIZE;
-#endif /* HAS_CTIME_R */
-#ifdef HAS_DRAND48_R
-#endif /* HAS_DRAND48_R */
-#ifdef HAS_GETGRNAM_R
-#   if defined(HAS_SYSCONF) && defined(_SC_GETGR_R_SIZE_MAX) && !defined(__GLIBC__)
+#  endif /* HAS_CTIME_R */
+
+#  ifdef HAS_GETGRNAM_R
+#    if defined(HAS_SYSCONF) && defined(_SC_GETGR_R_SIZE_MAX) && !defined(__GLIBC__)
        PL_reentrant_buffer->_grent_size = sysconf(_SC_GETGR_R_SIZE_MAX);
-       if (PL_reentrant_buffer->_grent_size == -1)
+       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
-#if   !(GETHOSTBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
+#    endif
+#  endif /* HAS_GETGRNAM_R */
+
+#  ifdef HAS_GETHOSTBYNAME_R
+#  if !(GETHOSTBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
        PL_reentrant_buffer->_hostent_size = REENTRANTUSUALSIZE;
-#endif
-#endif /* HAS_GETHOSTBYNAME_R */
-#ifdef HAS_GETLOGIN_R
+#  endif
+#  endif /* HAS_GETHOSTBYNAME_R */
+
+#  ifdef HAS_GETLOGIN_R
        PL_reentrant_buffer->_getlogin_size = REENTRANTSMALLSIZE;
-#endif /* HAS_GETLOGIN_R */
-#ifdef HAS_GETNETBYNAME_R
-#if   !(GETNETBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
+#  endif /* HAS_GETLOGIN_R */
+
+#  ifdef HAS_GETNETBYNAME_R
+#  if !(GETNETBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
        PL_reentrant_buffer->_netent_size = REENTRANTUSUALSIZE;
-#endif
-#endif /* HAS_GETNETBYNAME_R */
-#ifdef HAS_GETPROTOBYNAME_R
-#if   !(GETPROTOBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
+#  endif
+#  endif /* HAS_GETNETBYNAME_R */
+
+#  ifdef HAS_GETPROTOBYNAME_R
+#  if !(GETPROTOBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
        PL_reentrant_buffer->_protoent_size = REENTRANTUSUALSIZE;
-#endif
-#endif /* HAS_GETPROTOBYNAME_R */
-#ifdef HAS_GETPWNAM_R
-#   if defined(HAS_SYSCONF) && defined(_SC_GETPW_R_SIZE_MAX) && !defined(__GLIBC__)
+#  endif
+#  endif /* HAS_GETPROTOBYNAME_R */
+
+#  ifdef HAS_GETPWNAM_R
+#    if defined(HAS_SYSCONF) && defined(_SC_GETPW_R_SIZE_MAX) && !defined(__GLIBC__)
        PL_reentrant_buffer->_pwent_size = sysconf(_SC_GETPW_R_SIZE_MAX);
-       if (PL_reentrant_buffer->_pwent_size == -1)
+       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
-#if   !(GETSERVBYNAME_R_PROTO == REENTRANT_PROTO_I_CCSD)
+#    endif
+#  endif /* HAS_GETPWNAM_R */
+
+#  ifdef HAS_GETSERVBYNAME_R
+#  if !(GETSERVBYNAME_R_PROTO == REENTRANT_PROTO_I_CCSD)
        PL_reentrant_buffer->_servent_size = REENTRANTUSUALSIZE;
-#endif
-#endif /* HAS_GETSERVBYNAME_R */
-#ifdef HAS_GETSPNAM_R
-#   if defined(HAS_SYSCONF) && defined(_SC_GETPW_R_SIZE_MAX) && !defined(__GLIBC__)
+#  endif
+#  endif /* HAS_GETSERVBYNAME_R */
+
+#  ifdef HAS_GETSPNAM_R
+#    if defined(HAS_SYSCONF) && defined(_SC_GETPW_R_SIZE_MAX) && !defined(__GLIBC__)
        PL_reentrant_buffer->_spent_size = sysconf(_SC_GETPW_R_SIZE_MAX);
-       if (PL_reentrant_buffer->_spent_size == -1)
+       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_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
+#    endif
+#  endif /* HAS_GETSPNAM_R */
+
+#  ifdef HAS_READDIR_R
        /* This is the size Solaris recommends.
         * (though we go static, should use pathconf() instead) */
        PL_reentrant_buffer->_readdir_size = sizeof(struct dirent) + MAXPATHLEN + 1;
-#endif /* HAS_READDIR_R */
-#ifdef HAS_READDIR64_R
+#  endif /* HAS_READDIR_R */
+
+#  ifdef HAS_READDIR64_R
        /* This is the size Solaris recommends.
         * (though we go static, should use pathconf() instead) */
        PL_reentrant_buffer->_readdir64_size = sizeof(struct dirent64) + MAXPATHLEN + 1;
-#endif /* HAS_READDIR64_R */
-#ifdef HAS_SETLOCALE_R
+#  endif /* HAS_READDIR64_R */
+
+#  ifdef HAS_SETLOCALE_R
        PL_reentrant_buffer->_setlocale_size = REENTRANTSMALLSIZE;
-#endif /* HAS_SETLOCALE_R */
-#ifdef HAS_STRERROR_R
+#  endif /* HAS_SETLOCALE_R */
+
+#  ifdef HAS_STRERROR_R
        PL_reentrant_buffer->_strerror_size = REENTRANTSMALLSIZE;
-#endif /* HAS_STRERROR_R */
-#ifdef HAS_TTYNAME_R
+#  endif /* HAS_STRERROR_R */
+
+#  ifdef HAS_TTYNAME_R
        PL_reentrant_buffer->_ttyname_size = REENTRANTSMALLSIZE;
-#endif /* HAS_TTYNAME_R */
+#  endif /* HAS_TTYNAME_R */
+
 
 #endif /* USE_REENTRANT_API */
+
 }
 
 void
 Perl_reentrant_init(pTHX) {
+       PERL_UNUSED_CONTEXT;
+
+        /* Initialize the whole thing */
+
 #ifdef USE_REENTRANT_API
-       New(31337, PL_reentrant_buffer, 1, REENTR);
+
+       Newx(PL_reentrant_buffer, 1, REENTR);
        Perl_reentrant_size(aTHX);
-#ifdef HAS_ASCTIME_R
-       New(31338, PL_reentrant_buffer->_asctime_buffer, PL_reentrant_buffer->_asctime_size, char);
-#endif /* HAS_ASCTIME_R */
-#ifdef HAS_CRYPT_R
-#if CRYPT_R_PROTO != REENTRANT_PROTO_B_CCD
+
+#  ifdef HAS_ASCTIME_R
+       Newx(PL_reentrant_buffer->_asctime_buffer, PL_reentrant_buffer->_asctime_size, char);
+#  endif /* HAS_ASCTIME_R */
+
+#  ifdef HAS_CRYPT_R
+#  if CRYPT_R_PROTO != REENTRANT_PROTO_B_CCD
        PL_reentrant_buffer->_crypt_struct_buffer = 0;
-#endif
-#endif /* HAS_CRYPT_R */
-#ifdef HAS_CTIME_R
-       New(31338, PL_reentrant_buffer->_ctime_buffer, PL_reentrant_buffer->_ctime_size, char);
-#endif /* HAS_CTIME_R */
-#ifdef HAS_DRAND48_R
-#endif /* HAS_DRAND48_R */
-#ifdef HAS_GETGRNAM_R
+#  endif
+#  endif /* HAS_CRYPT_R */
+
+#  ifdef HAS_CTIME_R
+       Newx(PL_reentrant_buffer->_ctime_buffer, PL_reentrant_buffer->_ctime_size, char);
+#  endif /* HAS_CTIME_R */
+
+#  ifdef HAS_GETGRNAM_R
 #   ifdef USE_GRENT_FPTR
        PL_reentrant_buffer->_grent_fptr = NULL;
 #   endif
-       New(31338, PL_reentrant_buffer->_grent_buffer, PL_reentrant_buffer->_grent_size, char);
-#endif /* HAS_GETGRNAM_R */
-#ifdef HAS_GETHOSTBYNAME_R
-#if   !(GETHOSTBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
-       New(31338, PL_reentrant_buffer->_hostent_buffer, PL_reentrant_buffer->_hostent_size, char);
-#endif
-#endif /* HAS_GETHOSTBYNAME_R */
-#ifdef HAS_GETLOGIN_R
-       New(31338, PL_reentrant_buffer->_getlogin_buffer, PL_reentrant_buffer->_getlogin_size, char);
-#endif /* HAS_GETLOGIN_R */
-#ifdef HAS_GETNETBYNAME_R
-#if   !(GETNETBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
-       New(31338, PL_reentrant_buffer->_netent_buffer, PL_reentrant_buffer->_netent_size, char);
-#endif
-#endif /* HAS_GETNETBYNAME_R */
-#ifdef HAS_GETPROTOBYNAME_R
-#if   !(GETPROTOBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
-       New(31338, PL_reentrant_buffer->_protoent_buffer, PL_reentrant_buffer->_protoent_size, char);
-#endif
-#endif /* HAS_GETPROTOBYNAME_R */
-#ifdef HAS_GETPWNAM_R
+       Newx(PL_reentrant_buffer->_grent_buffer, PL_reentrant_buffer->_grent_size, char);
+#  endif /* HAS_GETGRNAM_R */
+
+#  ifdef HAS_GETHOSTBYNAME_R
+#  if !(GETHOSTBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
+       Newx(PL_reentrant_buffer->_hostent_buffer, PL_reentrant_buffer->_hostent_size, char);
+#  endif
+#  endif /* HAS_GETHOSTBYNAME_R */
+
+#  ifdef HAS_GETLOGIN_R
+       Newx(PL_reentrant_buffer->_getlogin_buffer, PL_reentrant_buffer->_getlogin_size, char);
+#  endif /* HAS_GETLOGIN_R */
+
+#  ifdef HAS_GETNETBYNAME_R
+#  if !(GETNETBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
+       Newx(PL_reentrant_buffer->_netent_buffer, PL_reentrant_buffer->_netent_size, char);
+#  endif
+#  endif /* HAS_GETNETBYNAME_R */
+
+#  ifdef HAS_GETPROTOBYNAME_R
+#  if !(GETPROTOBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
+       Newx(PL_reentrant_buffer->_protoent_buffer, PL_reentrant_buffer->_protoent_size, char);
+#  endif
+#  endif /* HAS_GETPROTOBYNAME_R */
+
+#  ifdef HAS_GETPWNAM_R
 #   ifdef USE_PWENT_FPTR
        PL_reentrant_buffer->_pwent_fptr = NULL;
 #   endif
-       New(31338, PL_reentrant_buffer->_pwent_buffer, PL_reentrant_buffer->_pwent_size, char);
-#endif /* HAS_GETPWNAM_R */
-#ifdef HAS_GETSERVBYNAME_R
-#if   !(GETSERVBYNAME_R_PROTO == REENTRANT_PROTO_I_CCSD)
-       New(31338, PL_reentrant_buffer->_servent_buffer, PL_reentrant_buffer->_servent_size, char);
-#endif
-#endif /* HAS_GETSERVBYNAME_R */
-#ifdef HAS_GETSPNAM_R
+       Newx(PL_reentrant_buffer->_pwent_buffer, PL_reentrant_buffer->_pwent_size, char);
+#  endif /* HAS_GETPWNAM_R */
+
+#  ifdef HAS_GETSERVBYNAME_R
+#  if !(GETSERVBYNAME_R_PROTO == REENTRANT_PROTO_I_CCSD)
+       Newx(PL_reentrant_buffer->_servent_buffer, PL_reentrant_buffer->_servent_size, char);
+#  endif
+#  endif /* HAS_GETSERVBYNAME_R */
+
+#  ifdef HAS_GETSPNAM_R
 #   ifdef USE_SPENT_FPTR
        PL_reentrant_buffer->_spent_fptr = NULL;
 #   endif
-       New(31338, 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
+       Newx(PL_reentrant_buffer->_spent_buffer, PL_reentrant_buffer->_spent_size, char);
+#  endif /* HAS_GETSPNAM_R */
+
+#  ifdef HAS_READDIR_R
        PL_reentrant_buffer->_readdir_struct = (struct dirent*)safemalloc(PL_reentrant_buffer->_readdir_size);
-#endif /* HAS_READDIR_R */
-#ifdef HAS_READDIR64_R
+#  endif /* HAS_READDIR_R */
+
+#  ifdef HAS_READDIR64_R
        PL_reentrant_buffer->_readdir64_struct = (struct dirent64*)safemalloc(PL_reentrant_buffer->_readdir64_size);
-#endif /* HAS_READDIR64_R */
-#ifdef HAS_SETLOCALE_R
-       New(31338, PL_reentrant_buffer->_setlocale_buffer, PL_reentrant_buffer->_setlocale_size, char);
-#endif /* HAS_SETLOCALE_R */
-#ifdef HAS_STRERROR_R
-       New(31338, PL_reentrant_buffer->_strerror_buffer, PL_reentrant_buffer->_strerror_size, char);
-#endif /* HAS_STRERROR_R */
-#ifdef HAS_TTYNAME_R
-       New(31338, PL_reentrant_buffer->_ttyname_buffer, PL_reentrant_buffer->_ttyname_size, char);
-#endif /* HAS_TTYNAME_R */
+#  endif /* HAS_READDIR64_R */
+
+#  ifdef HAS_SETLOCALE_R
+       Newx(PL_reentrant_buffer->_setlocale_buffer, PL_reentrant_buffer->_setlocale_size, char);
+#  endif /* HAS_SETLOCALE_R */
+
+#  ifdef HAS_STRERROR_R
+       Newx(PL_reentrant_buffer->_strerror_buffer, PL_reentrant_buffer->_strerror_size, char);
+#  endif /* HAS_STRERROR_R */
+
+#  ifdef HAS_TTYNAME_R
+       Newx(PL_reentrant_buffer->_ttyname_buffer, PL_reentrant_buffer->_ttyname_size, char);
+#  endif /* HAS_TTYNAME_R */
+
 
 #endif /* USE_REENTRANT_API */
+
 }
 
 void
 Perl_reentrant_free(pTHX) {
+       PERL_UNUSED_CONTEXT;
+
+        /* Tear down */
+
 #ifdef USE_REENTRANT_API
-#ifdef HAS_ASCTIME_R
+
+#  ifdef HAS_ASCTIME_R
        Safefree(PL_reentrant_buffer->_asctime_buffer);
-#endif /* HAS_ASCTIME_R */
-#ifdef HAS_CRYPT_R
-#if CRYPT_R_PROTO != REENTRANT_PROTO_B_CCD
+#  endif /* HAS_ASCTIME_R */
+
+#  ifdef HAS_CRYPT_R
+#  if CRYPT_R_PROTO != REENTRANT_PROTO_B_CCD
        Safefree(PL_reentrant_buffer->_crypt_struct_buffer);
-#endif
-#endif /* HAS_CRYPT_R */
-#ifdef HAS_CTIME_R
+#  endif
+#  endif /* HAS_CRYPT_R */
+
+#  ifdef HAS_CTIME_R
        Safefree(PL_reentrant_buffer->_ctime_buffer);
-#endif /* HAS_CTIME_R */
-#ifdef HAS_DRAND48_R
-#endif /* HAS_DRAND48_R */
-#ifdef HAS_GETGRNAM_R
+#  endif /* HAS_CTIME_R */
+
+#  ifdef HAS_GETGRNAM_R
        Safefree(PL_reentrant_buffer->_grent_buffer);
-#endif /* HAS_GETGRNAM_R */
-#ifdef HAS_GETHOSTBYNAME_R
-#if   !(GETHOSTBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
+#  endif /* HAS_GETGRNAM_R */
+
+#  ifdef HAS_GETHOSTBYNAME_R
+#  if !(GETHOSTBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
        Safefree(PL_reentrant_buffer->_hostent_buffer);
-#endif
-#endif /* HAS_GETHOSTBYNAME_R */
-#ifdef HAS_GETLOGIN_R
+#  endif
+#  endif /* HAS_GETHOSTBYNAME_R */
+
+#  ifdef HAS_GETLOGIN_R
        Safefree(PL_reentrant_buffer->_getlogin_buffer);
-#endif /* HAS_GETLOGIN_R */
-#ifdef HAS_GETNETBYNAME_R
-#if   !(GETNETBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
+#  endif /* HAS_GETLOGIN_R */
+
+#  ifdef HAS_GETNETBYNAME_R
+#  if !(GETNETBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
        Safefree(PL_reentrant_buffer->_netent_buffer);
-#endif
-#endif /* HAS_GETNETBYNAME_R */
-#ifdef HAS_GETPROTOBYNAME_R
-#if   !(GETPROTOBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
+#  endif
+#  endif /* HAS_GETNETBYNAME_R */
+
+#  ifdef HAS_GETPROTOBYNAME_R
+#  if !(GETPROTOBYNAME_R_PROTO == REENTRANT_PROTO_I_CSD)
        Safefree(PL_reentrant_buffer->_protoent_buffer);
-#endif
-#endif /* HAS_GETPROTOBYNAME_R */
-#ifdef HAS_GETPWNAM_R
+#  endif
+#  endif /* HAS_GETPROTOBYNAME_R */
+
+#  ifdef HAS_GETPWNAM_R
        Safefree(PL_reentrant_buffer->_pwent_buffer);
-#endif /* HAS_GETPWNAM_R */
-#ifdef HAS_GETSERVBYNAME_R
-#if   !(GETSERVBYNAME_R_PROTO == REENTRANT_PROTO_I_CCSD)
+#  endif /* HAS_GETPWNAM_R */
+
+#  ifdef HAS_GETSERVBYNAME_R
+#  if !(GETSERVBYNAME_R_PROTO == REENTRANT_PROTO_I_CCSD)
        Safefree(PL_reentrant_buffer->_servent_buffer);
-#endif
-#endif /* HAS_GETSERVBYNAME_R */
-#ifdef HAS_GETSPNAM_R
+#  endif
+#  endif /* HAS_GETSERVBYNAME_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
+#  endif /* HAS_GETSPNAM_R */
+
+#  ifdef HAS_READDIR_R
        Safefree(PL_reentrant_buffer->_readdir_struct);
-#endif /* HAS_READDIR_R */
-#ifdef HAS_READDIR64_R
+#  endif /* HAS_READDIR_R */
+
+#  ifdef HAS_READDIR64_R
        Safefree(PL_reentrant_buffer->_readdir64_struct);
-#endif /* HAS_READDIR64_R */
-#ifdef HAS_SETLOCALE_R
+#  endif /* HAS_READDIR64_R */
+
+#  ifdef HAS_SETLOCALE_R
        Safefree(PL_reentrant_buffer->_setlocale_buffer);
-#endif /* HAS_SETLOCALE_R */
-#ifdef HAS_STRERROR_R
+#  endif /* HAS_SETLOCALE_R */
+
+#  ifdef HAS_STRERROR_R
        Safefree(PL_reentrant_buffer->_strerror_buffer);
-#endif /* HAS_STRERROR_R */
-#ifdef HAS_TTYNAME_R
+#  endif /* HAS_STRERROR_R */
+
+#  ifdef HAS_TTYNAME_R
        Safefree(PL_reentrant_buffer->_ttyname_buffer);
-#endif /* HAS_TTYNAME_R */
+#  endif /* HAS_TTYNAME_R */
+
 
        Safefree(PL_reentrant_buffer);
+
 #endif /* USE_REENTRANT_API */
 }
 
 void*
 Perl_reentrant_retry(const char *f, ...)
 {
-    dTHX;
+    /* This function is set up to be called if the normal function returns
+     * failure with errno ERANGE, which indicates the buffer is too small.
+     * This function calls the failing one again with a larger buffer.
+     *
+     * What has happened is that, due to the magic of C preprocessor macro
+     * expansion, when the original code called function 'foo(args)', it was
+     * instead compiled into something like a call of 'foo_r(args, buffer)'
+     * Below we retry with 'foo', but the preprocessor has changed that into
+     * 'foo_r', so this function will end up calling itself recursively, each
+     * time with a larger buffer.  If PERL_REENTRANT_MAXSIZE is defined, it
+     * won't increase beyond that, instead failing. */
+
     void *retptr = NULL;
+    va_list ap;
+
+#ifdef USE_REENTRANT_API
+
+    dTHX;
+
+    /* 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;
@@ -313,162 +391,175 @@ 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
-    va_list ap;
-
-    va_start(ap, f);
 
     switch (PL_op->op_type) {
-#ifdef USE_HOSTENT_BUFFER
+
+#  ifdef USE_HOSTENT_BUFFER
+
     case OP_GHBYADDR:
     case OP_GHBYNAME:
     case OP_GHOSTENT:
        {
-#ifdef PERL_REENTRANT_MAXSIZE
+
+#    ifdef PERL_REENTRANT_MAXSIZE
            if (PL_reentrant_buffer->_hostent_size <=
                PERL_REENTRANT_MAXSIZE / 2)
-#endif
+#    endif
            {
-               PL_reentrant_buffer->_hostent_size *= 2;
-               Renew(PL_reentrant_buffer->_hostent_buffer,
-                     PL_reentrant_buffer->_hostent_size, char);
-               switch (PL_op->op_type) {
+            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 *);
                    asize = va_arg(ap, size_t);
                    anint  = va_arg(ap, int);
-                   retptr = gethostbyaddr(p0, asize, anint); break;
+                   retptr = gethostbyaddr((Netdb_host_t) p0, (Netdb_hlen_t) asize, anint); break;
                case OP_GHBYNAME:
                    p0 = va_arg(ap, void *);
-                   retptr = gethostbyname(p0); break;
+                   retptr = gethostbyname((Netdb_name_t) p0); break;
                case OP_GHOSTENT:
                    retptr = gethostent(); break;
                default:
                    SETERRNO(ERANGE, LIB_INVARG);
                    break;
-               }
+            }
            }
        }
        break;
-#endif
-#ifdef USE_GRENT_BUFFER
+
+#  endif
+#  ifdef USE_GRENT_BUFFER
+
     case OP_GGRNAM:
     case OP_GGRGID:
     case OP_GGRENT:
        {
-#ifdef PERL_REENTRANT_MAXSIZE
+
+#    ifdef PERL_REENTRANT_MAXSIZE
            if (PL_reentrant_buffer->_grent_size <=
                PERL_REENTRANT_MAXSIZE / 2)
-#endif
+#    endif
            {
                Gid_t gid;
-               PL_reentrant_buffer->_grent_size *= 2;
-               Renew(PL_reentrant_buffer->_grent_buffer,
-                     PL_reentrant_buffer->_grent_size, char);
-               switch (PL_op->op_type) {
+            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 *);
-                   retptr = getgrnam(p0); break;
-               case OP_GGRGID:
-#if Gid_t_size < INTSIZE
-                   gid = (Gid_t)va_arg(ap, int);
-#else
+                   retptr = getgrnam((char *)p0); break;
+                case OP_GGRGID:
+
+#    if Gid_t_size < INTSIZE
+                    gid = (Gid_t)va_arg(ap, int);
+#    else
                    gid = va_arg(ap, Gid_t);
-#endif
+#    endif
                    retptr = getgrgid(gid); break;
                case OP_GGRENT:
                    retptr = getgrent(); break;
                default:
                    SETERRNO(ERANGE, LIB_INVARG);
                    break;
-               }
+            }
            }
        }
        break;
-#endif
-#ifdef USE_NETENT_BUFFER
+
+#  endif
+#  ifdef USE_NETENT_BUFFER
+
     case OP_GNBYADDR:
     case OP_GNBYNAME:
     case OP_GNETENT:
        {
-#ifdef PERL_REENTRANT_MAXSIZE
+
+#    ifdef PERL_REENTRANT_MAXSIZE
            if (PL_reentrant_buffer->_netent_size <=
                PERL_REENTRANT_MAXSIZE / 2)
-#endif
+#    endif
            {
                Netdb_net_t net;
-               PL_reentrant_buffer->_netent_size *= 2;
-               Renew(PL_reentrant_buffer->_netent_buffer,
-                     PL_reentrant_buffer->_netent_size, char);
-               switch (PL_op->op_type) {
+            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);
                    anint = va_arg(ap, int);
                    retptr = getnetbyaddr(net, anint); break;
                case OP_GNBYNAME:
                    p0 = va_arg(ap, void *);
-                   retptr = getnetbyname(p0); break;
+                   retptr = getnetbyname((char *)p0); break;
                case OP_GNETENT:
                    retptr = getnetent(); break;
                default:
                    SETERRNO(ERANGE, LIB_INVARG);
                    break;
-               }
-           }
+            }
+            }
        }
        break;
-#endif
-#ifdef USE_PWENT_BUFFER
+
+#  endif
+#  ifdef USE_PWENT_BUFFER
+
     case OP_GPWNAM:
     case OP_GPWUID:
     case OP_GPWENT:
        {
-#ifdef PERL_REENTRANT_MAXSIZE
+
+#    ifdef PERL_REENTRANT_MAXSIZE
            if (PL_reentrant_buffer->_pwent_size <=
                PERL_REENTRANT_MAXSIZE / 2)
-#endif
+
+#    endif
            {
                Uid_t uid;
-               PL_reentrant_buffer->_pwent_size *= 2;
-               Renew(PL_reentrant_buffer->_pwent_buffer,
-                     PL_reentrant_buffer->_pwent_size, char);
-               switch (PL_op->op_type) {
+            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 *);
-                   retptr = getpwnam(p0); break;
+                   retptr = getpwnam((char *)p0); break;
                case OP_GPWUID:
-#if Uid_t_size < INTSIZE
+
+#    if Uid_t_size < INTSIZE
                    uid = (Uid_t)va_arg(ap, int);
-#else
+#    else
                    uid = va_arg(ap, Uid_t);
-#endif
+#    endif
                    retptr = getpwuid(uid); break;
+
+#  if defined(HAS_GETPWENT) || defined(HAS_GETPWENT_R)
                case OP_GPWENT:
                    retptr = getpwent(); break;
+#  endif
                default:
                    SETERRNO(ERANGE, LIB_INVARG);
                    break;
-               }
+            }
            }
        }
        break;
-#endif
-#ifdef USE_PROTOENT_BUFFER
+
+#  endif
+#  ifdef USE_PROTOENT_BUFFER
+
     case OP_GPBYNAME:
     case OP_GPBYNUMBER:
     case OP_GPROTOENT:
        {
-#ifdef PERL_REENTRANT_MAXSIZE
+
+#    ifdef PERL_REENTRANT_MAXSIZE
            if (PL_reentrant_buffer->_protoent_size <=
                PERL_REENTRANT_MAXSIZE / 2)
-#endif
+#    endif
            {
-               PL_reentrant_buffer->_protoent_size *= 2;
-               Renew(PL_reentrant_buffer->_protoent_buffer,
-                     PL_reentrant_buffer->_protoent_size, char);
-               switch (PL_op->op_type) {
+            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 *);
-                   retptr = getprotobyname(p0); break;
+                   retptr = getprotobyname((char *)p0); break;
                case OP_GPBYNUMBER:
                    anint = va_arg(ap, int);
                    retptr = getprotobynumber(anint); break;
@@ -477,50 +568,61 @@ Perl_reentrant_retry(const char *f, ...)
                default:
                    SETERRNO(ERANGE, LIB_INVARG);
                    break;
-               }
+           }
            }
        }
        break;
-#endif
-#ifdef USE_SERVENT_BUFFER
+
+#  endif
+#  ifdef USE_SERVENT_BUFFER
+
     case OP_GSBYNAME:
     case OP_GSBYPORT:
     case OP_GSERVENT:
        {
-#ifdef PERL_REENTRANT_MAXSIZE
+
+#    ifdef PERL_REENTRANT_MAXSIZE
            if (PL_reentrant_buffer->_servent_size <=
                PERL_REENTRANT_MAXSIZE / 2)
-#endif
+#    endif
            {
-               PL_reentrant_buffer->_servent_size *= 2;
-               Renew(PL_reentrant_buffer->_servent_buffer,
-                     PL_reentrant_buffer->_servent_size, char);
-               switch (PL_op->op_type) {
+            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 *);
                    p1 = va_arg(ap, void *);
-                   retptr = getservbyname(p0, p1); break;
+                   retptr = getservbyname((char *)p0, (char *)p1); break;
                case OP_GSBYPORT:
                    anint = va_arg(ap, int);
                    p0 = va_arg(ap, void *);
-                   retptr = getservbyport(anint, p0); break;
+                   retptr = getservbyport(anint, (char *)p0); break;
                case OP_GSERVENT:
                    retptr = getservent(); break;
                default:
                    SETERRNO(ERANGE, LIB_INVARG);
                    break;
-               }
+            }
            }
        }
        break;
-#endif
+
+#  endif
+
     default:
        /* Not known how to retry, so just fail. */
        break;
     }
 
-    va_end(ap);
+#else
+
+    PERL_UNUSED_ARG(f);
+
 #endif
+
+    }
+    va_end(ap);
     return retptr;
 }
 
+/* ex: set ro: */