reentr.[ch]: White-space only

I changed the preprocessor directive indentation to make it easier to
grasp the nesting levels, and added blank lines for readability.

Some of the changes are for future commits that will remove some
nesting.

1 files changed, 290 insertions, 201 deletions

diff --git a/reentr.c b/reentr.c
index 8e00a62585..9b562e5e81 100644
--- a/reentr.c
+++ b/reentr.c
@@ -25,7 +25,7 @@
  * 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.  
+ * regarding these reentrant interfaces.
  */
 
 #include "EXTERN.h"
@@ -47,99 +47,117 @@ Perl_reentrant_size(pTHX) {
         /* 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_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 == (size_t) -1)
 		PL_reentrant_buffer->_grent_size = REENTRANTUSUALSIZE;
-#   elif defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
+#    elif defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
 	PL_reentrant_buffer->_grent_size = SIABUFSIZ;
-#   elif defined(__sgi)
+#    elif defined(__sgi)
 	PL_reentrant_buffer->_grent_size = BUFSIZ;
-#   else
+#    else
 	PL_reentrant_buffer->_grent_size = REENTRANTUSUALSIZE;
-#   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 == (size_t) -1)
 		PL_reentrant_buffer->_pwent_size = REENTRANTUSUALSIZE;
-#   elif defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
+#    elif defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
 	PL_reentrant_buffer->_pwent_size = SIABUFSIZ;
-#   elif defined(__sgi)
+#    elif defined(__sgi)
 	PL_reentrant_buffer->_pwent_size = BUFSIZ;
-#   else
+#    else
 	PL_reentrant_buffer->_pwent_size = REENTRANTUSUALSIZE;
-#   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 == (size_t) -1)
 		PL_reentrant_buffer->_spent_size = REENTRANTUSUALSIZE;
-#   elif defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
+#    elif defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
 	PL_reentrant_buffer->_spent_size = SIABUFSIZ;
-#   elif defined(__sgi)
+#    elif defined(__sgi)
 	PL_reentrant_buffer->_spent_size = BUFSIZ;
-#   else
+#    else
 	PL_reentrant_buffer->_spent_size = REENTRANTUSUALSIZE;
-#   endif 
-#endif /* HAS_GETSPNAM_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
@@ -149,77 +167,96 @@ Perl_reentrant_init(pTHX) {
         /* Initialize the whole thing */
 
 #ifdef USE_REENTRANT_API
+
 	Newx(PL_reentrant_buffer, 1, REENTR);
 	Perl_reentrant_size(aTHX);
-#ifdef HAS_ASCTIME_R
+
+#  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
+#  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
+#  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
+#  endif /* HAS_CTIME_R */
+
+#  ifdef HAS_GETGRNAM_R
 #   ifdef USE_GRENT_FPTR
 	PL_reentrant_buffer->_grent_fptr = NULL;
 #   endif
 	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)
+#  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
+#  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)
+#  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)
+#  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
+#  endif
+#  endif /* HAS_GETPROTOBYNAME_R */
+
+#  ifdef HAS_GETPWNAM_R
 #   ifdef USE_PWENT_FPTR
 	PL_reentrant_buffer->_pwent_fptr = NULL;
 #   endif
 	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)
+#  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
+#  endif
+#  endif /* HAS_GETSERVBYNAME_R */
+
+#  ifdef HAS_GETSPNAM_R
 #   ifdef USE_SPENT_FPTR
 	PL_reentrant_buffer->_spent_fptr = NULL;
 #   endif
 	Newx(PL_reentrant_buffer->_spent_buffer, PL_reentrant_buffer->_spent_size, char);
-#endif /* HAS_GETSPNAM_R */
-#ifdef HAS_READDIR_R
+#  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
+#  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
+#  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
+#  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 /* HAS_TTYNAME_R */
+
 
 #endif /* USE_REENTRANT_API */
+
 }
 
 void
@@ -229,66 +266,84 @@ Perl_reentrant_free(pTHX) {
         /* 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_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_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 */
 }
 
@@ -309,14 +364,20 @@ Perl_reentrant_retry(const char *f, ...)
 
     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;
@@ -332,19 +393,22 @@ Perl_reentrant_retry(const char *f, ...)
 #  endif
 
     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
 	    {
-		RenewDouble(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);
@@ -358,59 +422,66 @@ Perl_reentrant_retry(const char *f, ...)
 	        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;
-		RenewDouble(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((char *)p0); break;
-	        case OP_GGRGID:
-#if Gid_t_size < INTSIZE
-		    gid = (Gid_t)va_arg(ap, int);
-#else
+                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;
-		RenewDouble(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);
@@ -423,60 +494,69 @@ Perl_reentrant_retry(const char *f, ...)
 	        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;
-		RenewDouble(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((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)
+
+#  if defined(HAS_GETPWENT) || defined(HAS_GETPWENT_R)
 	        case OP_GPWENT:
 		    retptr = getpwent(); break;
-#endif
+#  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
 	    {
-		RenewDouble(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((char *)p0); break;
@@ -488,24 +568,27 @@ 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
 	    {
-		RenewDouble(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 *);
@@ -519,18 +602,24 @@ Perl_reentrant_retry(const char *f, ...)
 	        default:
 		    SETERRNO(ERANGE, LIB_INVARG);
 		    break;
-	        }
+            }
 	    }
 	}
 	break;
-#endif
+
+#  endif
+
     default:
 	/* Not known how to retry, so just fail. */
 	break;
     }
+
 #else
+
     PERL_UNUSED_ARG(f);
+
 #endif
+
     }
     va_end(ap);
     return retptr;