libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-19 04:49:25 +08:00
Code Issues Projects Releases Wiki Activity

Reentrancy, use _REENT_ERRNO()

Browse Source 
Use _REENT_ERRNO() macro to access errno.  This encapsulation is
required, as errno might be either _errno member of struct _reent,
_tls_errno or any such implementation detail.
This commit is contained in:
Pekka Seppänen 2023-08-30 12:16:26 +03:00 committed by Sebastian Huber
parent f5e37b93a0
commit 766f1beb4d
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
newlib/libc/locale/locale.c
View File

@ -317,7 +317,7 @@ _setlocale_r (struct _reent *p,
if (category < LC_ALL || category >= _LC_LAST)
{
p->_errno = EINVAL;
_REENT_ERRNO(p) = EINVAL;
return NULL;
}
@ -343,7 +343,7 @@ _setlocale_r (struct _reent *p,
env = __get_locale_env (p, i);
if (strlen (env) > ENCODING_LEN)
{
p->_errno = EINVAL;
_REENT_ERRNO(p) = EINVAL;
return NULL;
}
strcpy (new_categories[i], env);
@ -354,7 +354,7 @@ _setlocale_r (struct _reent *p,
env = __get_locale_env (p, category);
if (strlen (env) > ENCODING_LEN)
{
p->_errno = EINVAL;
_REENT_ERRNO(p) = EINVAL;
return NULL;
}
strcpy (new_categories[category], env);
@ -364,7 +364,7 @@ _setlocale_r (struct _reent *p,
{
if (strlen (locale) > ENCODING_LEN)
{
p->_errno = EINVAL;
_REENT_ERRNO(p) = EINVAL;
return NULL;
}
strcpy (new_categories[category], locale);
@ -375,7 +375,7 @@ _setlocale_r (struct _reent *p,
{
if (strlen (locale) > ENCODING_LEN)
{
p->_errno = EINVAL;
_REENT_ERRNO(p) = EINVAL;
return NULL;
}
for (i = 1; i < _LC_LAST; ++i)
@ -387,7 +387,7 @@ _setlocale_r (struct _reent *p,
;
if (!r[1])
{
p->_errno = EINVAL;
_REENT_ERRNO(p) = EINVAL;
return NULL; /* Hmm, just slashes... */
}
do
@ -396,7 +396,7 @@ _setlocale_r (struct _reent *p,
break; /* Too many slashes... */
if ((len = r - locale) > ENCODING_LEN)
{
p->_errno = EINVAL;
_REENT_ERRNO(p) = EINVAL;
return NULL;
}
strlcpy (new_categories[i], locale, len + 1);
@ -429,7 +429,7 @@ _setlocale_r (struct _reent *p,
strcpy (saved_categories[i], __get_global_locale ()->categories[i]);
if (__loadlocale (__get_global_locale (), i, new_categories[i]) == NULL)
{
saverr = p->_errno;
saverr = _REENT_ERRNO(p);
for (j = 1; j < i; j++)
{
strcpy (new_categories[j], saved_categories[j]);
@ -440,7 +440,7 @@ _setlocale_r (struct _reent *p,
__loadlocale (__get_global_locale (), j, new_categories[j]);
}
}
p->_errno = saverr;
_REENT_ERRNO(p) = saverr;
return NULL;
}
}

6
newlib/libc/locale/newlocale.c
View File

@ -103,7 +103,7 @@ _newlocale_r (struct _reent *p, int category_mask, const char *locale,
/* Check for invalid mask values and valid locale ptr. */
if ((category_mask & ~LC_VALID_MASK) || !locale)
{
p->_errno = EINVAL;
_REENT_ERRNO(p) = EINVAL;
return NULL;
}
/* If the new locale is supposed to be all default locale, just return
@ -125,7 +125,7 @@ _newlocale_r (struct _reent *p, int category_mask, const char *locale,
: locale;
if (strlen (cat) > ENCODING_LEN)
{
p->_errno = EINVAL;
_REENT_ERRNO(p) = EINVAL;
return NULL;
}
strcpy (new_categories[i], cat);
@ -172,7 +172,7 @@ _newlocale_r (struct _reent *p, int category_mask, const char *locale,
/* Otherwise load locale data. */
else if (!__loadlocale (&tmp_locale, i, new_categories[i]))
{
p->_errno = ENOENT;
_REENT_ERRNO(p) = ENOENT;
goto error;
}
}

2
newlib/libc/stdlib/_mallocr.c
View File

@ -346,7 +346,7 @@ extern void __malloc_unlock();
#define RDECL struct _reent *reent_ptr;
#endif
#define RERRNO reent_ptr->_errno
#define RERRNO _REENT_ERRNO(reent_ptr)
#define RCALL reent_ptr,
#define RONECALL reent_ptr

2
newlib/libc/stdlib/nano-mallocr.c
View File

@ -64,7 +64,7 @@
#define MALLOC_LOCK __malloc_lock(reent_ptr)
#define MALLOC_UNLOCK __malloc_unlock(reent_ptr)
#define RERRNO reent_ptr->_errno
#define RERRNO _REENT_ERRNO(reent_ptr)
#define nano_malloc _malloc_r
#define nano_free _free_r