reentr.pl: warning fixes, getpwentr_size fix
authorSlaven Rezic <slaven@rezic.de>
Fri, 29 Mar 2002 12:19:58 +0000 (13:19 +0100)
committerJarkko Hietaniemi <jhi@iki.fi>
Fri, 29 Mar 2002 13:44:25 +0000 (13:44 +0000)
Message-Id: <200203291119.g2TBJwqB016888@vran.herceg.de>

p4raw-id: //depot/perl@15595

reentr.c
reentr.pl

index c5afa07..b0ebd92 100644 (file)
--- a/reentr.c
+++ b/reentr.c
@@ -72,8 +72,8 @@ Perl_reentrant_size(pTHX) {
 #ifdef HAS_GETPWNAM_R
 #   if defined(HAS_SYSCONF) && defined(_SC_GETPW_R_SIZE_MAX) && !defined(__GLIBC__)
        PL_reentrant_buffer->_getpwent_size = sysconf(_SC_GETPW_R_SIZE_MAX);
-       if (PL_reentrant_buffer->_getgrent_size == -1)
-               PL_reentrant_buffer->_getgrent_size = REENTRANTUSUALSIZE;
+       if (PL_reentrant_buffer->_getpwent_size == -1)
+               PL_reentrant_buffer->_getpwent_size = REENTRANTUSUALSIZE;
 #   else
 #       if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
        PL_reentrant_buffer->_getpwent_size = SIABUFSIZ;
@@ -281,9 +281,18 @@ Perl_reentrant_retry(const char *f, ...)
     dTHX;
     void *retptr = NULL;
 #ifdef USE_REENTRANT_API
-    void *p0, *p1;
+#  if defined(USE_GETHOSTENT_BUFFER) || defined(USE_GETGRENT_BUFFER) || defined(USE_GETNETENT_BUFFER) || defined(USE_GETPWENT_BUFFER) || defined(USE_GETPROTOENT_BUFFER) || defined(USE_GETSERVENT_BUFFER)
+    void *p0;
+#  endif
+#  if defined(USE_GETSERVENT_BUFFER)
+    void *p1;
+#  endif
+#  if defined(USE_GETHOSTENT_BUFFER)
     size_t asize;
+#  endif
+#  if defined(USE_GETHOSTENT_BUFFER) || defined(USE_GETNETENT_BUFFER) || defined(USE_GETPROTOENT_BUFFER) || defined(USE_GETSERVENT_BUFFER)
     int anint;
+#  endif
     va_list ap;
 
     va_start(ap, f);
index ef9a7a1..5c566f1 100644 (file)
--- a/reentr.pl
+++ b/reentr.pl
@@ -469,11 +469,13 @@ EOF
 EOF
                my $sc = $g eq 'getgrent' ?
                    '_SC_GETGR_R_SIZE_MAX' : '_SC_GETPW_R_SIZE_MAX';
+               my $sz = $g eq 'getgrent' ?
+                    '_getgrent_size' : '_getpwent_size';
                push @size, <<EOF;
 #   if defined(HAS_SYSCONF) && defined($sc) && !defined(__GLIBC__)
        PL_reentrant_buffer->_${g}_size = sysconf($sc);
-       if (PL_reentrant_buffer->_getgrent_size == -1)
-               PL_reentrant_buffer->_getgrent_size = REENTRANTUSUALSIZE;
+       if (PL_reentrant_buffer->$sz == -1)
+               PL_reentrant_buffer->$sz = REENTRANTUSUALSIZE;
 #   else
 #       if defined(__osf__) && defined(__alpha) && defined(SIABUFSIZ)
        PL_reentrant_buffer->_${g}_size = SIABUFSIZ;
@@ -722,9 +724,18 @@ Perl_reentrant_retry(const char *f, ...)
     dTHX;
     void *retptr = NULL;
 #ifdef USE_REENTRANT_API
-    void *p0, *p1;
+#  if defined(USE_GETHOSTENT_BUFFER) || defined(USE_GETGRENT_BUFFER) || defined(USE_GETNETENT_BUFFER) || defined(USE_GETPWENT_BUFFER) || defined(USE_GETPROTOENT_BUFFER) || defined(USE_GETSERVENT_BUFFER)
+    void *p0;
+#  endif
+#  if defined(USE_GETSERVENT_BUFFER)
+    void *p1;
+#  endif
+#  if defined(USE_GETHOSTENT_BUFFER)
     size_t asize;
+#  endif
+#  if defined(USE_GETHOSTENT_BUFFER) || defined(USE_GETNETENT_BUFFER) || defined(USE_GETPROTOENT_BUFFER) || defined(USE_GETSERVENT_BUFFER)
     int anint;
+#  endif
     va_list ap;
 
     va_start(ap, f);