diff options
| author | Marek Polacek <polacek@redhat.com> | 2012-04-29 15:34:20 +0200 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2012-04-29 15:34:20 +0200 |
| commit | 5ac3ea17df811a71fa64aff78ea1b900facd3364 (patch) | |
| tree | 47a842e0be1ca4d8c98ecc86d18330d61047560a /stdlib | |
| parent | ecf0ebfb04f6e31e3ba709521b6955d5f86ff724 (diff) | |
| download | glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.tar.gz glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.tar.xz glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.zip | |
Fix attributes for fortify functions.
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/bits/stdlib.h | 10 | ||||
| -rw-r--r-- | stdlib/stdlib.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h index 43c45a63ab..084b43847c 100644 --- a/stdlib/bits/stdlib.h +++ b/stdlib/bits/stdlib.h @@ -33,7 +33,7 @@ extern char *__REDIRECT_NTH (__realpath_chk_warn, __warnattr ("second argument of realpath must be either NULL or at " "least PATH_MAX bytes long buffer"); -__extern_always_inline __wur char * +__fortify_function __wur char * __NTH (realpath (const char *__restrict __name, char *__restrict __resolved)) { if (__bos (__resolved) != (size_t) -1) @@ -60,7 +60,7 @@ extern int __REDIRECT_NTH (__ptsname_r_chk_warn, __nonnull ((2)) __warnattr ("ptsname_r called with buflen bigger than " "size of buf"); -__extern_always_inline int +__fortify_function int __NTH (ptsname_r (int __fd, char *__buf, size_t __buflen)) { if (__bos (__buf) != (size_t) -1) @@ -79,7 +79,7 @@ extern int __wctomb_chk (char *__s, wchar_t __wchar, size_t __buflen) extern int __REDIRECT_NTH (__wctomb_alias, (char *__s, wchar_t __wchar), wctomb) __wur; -__extern_always_inline __wur int +__fortify_function __wur int __NTH (wctomb (char *__s, wchar_t __wchar)) { /* We would have to include <limits.h> to get a definition of MB_LEN_MAX. @@ -109,7 +109,7 @@ extern size_t __REDIRECT_NTH (__mbstowcs_chk_warn, __warnattr ("mbstowcs called with dst buffer smaller than len " "* sizeof (wchar_t)"); -__extern_always_inline size_t +__fortify_function size_t __NTH (mbstowcs (wchar_t *__restrict __dst, const char *__restrict __src, size_t __len)) { @@ -140,7 +140,7 @@ extern size_t __REDIRECT_NTH (__wcstombs_chk_warn, size_t __len, size_t __dstlen), __wcstombs_chk) __warnattr ("wcstombs called with dst buffer smaller than len"); -__extern_always_inline size_t +__fortify_function size_t __NTH (wcstombs (char *__restrict __dst, const wchar_t *__restrict __src, size_t __len)) { diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index cdc9e02e13..f652eda3fe 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -953,7 +953,7 @@ extern int getloadavg (double __loadavg[], int __nelem) /* Define some macros helping to catch buffer overflows. */ -#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline +#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function # include <bits/stdlib.h> #endif #ifdef __LDBL_COMPAT |