Add _REENT_ERRNO(ptr)

Add a _REENT_ERRNO() macro to encapsulate the access to the
_errno member of struct reent. This will help to replace the
structure member with a thread-local storage object in a follow
up patch.

Replace uses of __errno_r() with _REENT_ERRNO().  Keep __errno_r() macro for
potential users outside of Newlib.

4 files changed, 14 insertions, 14 deletions

diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index 02c749d7f..458541cb9 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -211,7 +211,7 @@ _iconv_r (struct _reent *rptr,
        || (ic->handlers != &_iconv_null_conversion_handlers
            && ic->handlers != &_iconv_ucs_conversion_handlers))
     {
-      __errno_r (rptr) = EBADF;
+      _REENT_ERRNO (rptr) = EBADF;
       return (size_t)-1;
     }
 
@@ -257,19 +257,19 @@ _iconv_r (struct _reent *rptr,
            ic->handlers->set_state (ic->data, &state_save, 1);
         }
        
-      __errno_r (rptr) = E2BIG;
+      _REENT_ERRNO (rptr) = E2BIG;
       return (size_t)-1;
     }
   
   if (*inbytesleft == 0)
     {
-      __errno_r (rptr) = EINVAL;
+      _REENT_ERRNO (rptr) = EINVAL;
       return (size_t)-1;
     }
    
   if (*outbytesleft == 0 || *outbuf == NULL)
     {
-      __errno_r (rptr) = E2BIG;
+      _REENT_ERRNO (rptr) = E2BIG;
       return (size_t)-1;
     }
 
@@ -294,7 +294,7 @@ _iconv_close_r (struct _reent *rptr,
        || (ic->handlers != &_iconv_null_conversion_handlers
            && ic->handlers != &_iconv_ucs_conversion_handlers))
     {
-      __errno_r (rptr) = EBADF;
+      _REENT_ERRNO (rptr) = EBADF;
       return -1;
     }
 
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index ed8f3a7ba..5d4b0a273 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -177,7 +177,7 @@ _iconv_nls_conv (struct _reent *rptr,
        || (ic->handlers != &_iconv_null_conversion_handlers
            && ic->handlers != &_iconv_ucs_conversion_handlers))
     {
-      __errno_r (rptr) = EBADF;
+      _REENT_ERRNO (rptr) = EBADF;
       return (size_t)-1;
     }
   
@@ -189,7 +189,7 @@ _iconv_nls_conv (struct _reent *rptr,
   
   if (outbytesleft == NULL || *outbytesleft == 0)
     {
-      __errno_r (rptr) = E2BIG;
+      _REENT_ERRNO (rptr) = E2BIG;
       return (size_t)-1;
     }
 
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index e75d83376..cc4229181 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -73,7 +73,7 @@ null_conversion_convert (struct _reent *rptr,
     {
       result = (size_t)-1;
       len = *outbytesleft;
-      __errno_r (rptr) = E2BIG;
+      _REENT_ERRNO (rptr) = E2BIG;
     }
   
   if ((flags & 1) == 0)
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index 59f4f993d..502aa440a 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -164,7 +164,7 @@ ucs_based_conversion_convert (struct _reent *rptr,
 
       if (*outbytesleft == 0)
         {
-          __errno_r (rptr) = E2BIG;
+          _REENT_ERRNO (rptr) = E2BIG;
           return (size_t)-1;
         }
 
@@ -173,13 +173,13 @@ ucs_based_conversion_convert (struct _reent *rptr,
 
       if (ch == (ucs4_t)ICONV_CES_BAD_SEQUENCE)
         {
-          __errno_r (rptr) = EINVAL;
+          _REENT_ERRNO (rptr) = EINVAL;
           return (size_t)-1;
         }
 
       if (ch == (ucs4_t)ICONV_CES_INVALID_CHARACTER)
         {
-          __errno_r (rptr) = EILSEQ;
+          _REENT_ERRNO (rptr) = EILSEQ;
           return (size_t)-1;
         }
 
@@ -196,7 +196,7 @@ ucs_based_conversion_convert (struct _reent *rptr,
         {
           *inbuf = inbuf_save;
           *inbytesleft = inbyteslef_save;
-          __errno_r (rptr) = E2BIG;
+          _REENT_ERRNO (rptr) = E2BIG;
           return (size_t)-1;
         }
       else if (bytes == (size_t)ICONV_CES_INVALID_CHARACTER)
@@ -204,7 +204,7 @@ ucs_based_conversion_convert (struct _reent *rptr,
           if (flags & ICONV_FAIL_BIT)
             {
               /* Generate error */
-              __errno_r (rptr) = EILSEQ;
+              _REENT_ERRNO (rptr) = EILSEQ;
               return (size_t)-1;
             }
           /*
@@ -221,7 +221,7 @@ ucs_based_conversion_convert (struct _reent *rptr,
                                          outbytesleft);
           if ((__int32_t)bytes < 0)
             {
-              __errno_r (rptr) = E2BIG;
+              _REENT_ERRNO (rptr) = E2BIG;
               return (size_t)-1;
             }