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 /io | |
| parent | ecf0ebfb04f6e31e3ba709521b6955d5f86ff724 (diff) | |
| download | glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.tar.gz glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.tar.xz glibc-5ac3ea17df811a71fa64aff78ea1b900facd3364.zip | |
Fix attributes for fortify functions.
Diffstat (limited to 'io')
| -rw-r--r-- | io/bits/fcntl2.h | 8 | ||||
| -rw-r--r-- | io/bits/poll2.h | 4 | ||||
| -rw-r--r-- | io/fcntl.h | 2 | ||||
| -rw-r--r-- | io/sys/poll.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/io/bits/fcntl2.h b/io/bits/fcntl2.h index 09b81e6a8a..76df18b1d7 100644 --- a/io/bits/fcntl2.h +++ b/io/bits/fcntl2.h @@ -37,7 +37,7 @@ __errordecl (__open_too_many_args, __errordecl (__open_missing_mode, "open with O_CREAT in second argument needs 3 arguments"); -__extern_always_inline int +__fortify_function int open (const char *__path, int __oflag, ...) { if (__va_arg_pack_len () > 1) @@ -69,7 +69,7 @@ __errordecl (__open64_too_many_args, __errordecl (__open64_missing_mode, "open64 with O_CREAT in second argument needs 3 arguments"); -__extern_always_inline int +__fortify_function int open64 (const char *__path, int __oflag, ...) { if (__va_arg_pack_len () > 1) @@ -113,7 +113,7 @@ __errordecl (__openat_too_many_args, __errordecl (__openat_missing_mode, "openat with O_CREAT in third argument needs 4 arguments"); -__extern_always_inline int +__fortify_function int openat (int __fd, const char *__path, int __oflag, ...) { if (__va_arg_pack_len () > 1) @@ -147,7 +147,7 @@ __errordecl (__openat64_too_many_args, __errordecl (__openat64_missing_mode, "openat64 with O_CREAT in third argument needs 4 arguments"); -__extern_always_inline int +__fortify_function int openat64 (int __fd, const char *__path, int __oflag, ...) { if (__va_arg_pack_len () > 1) diff --git a/io/bits/poll2.h b/io/bits/poll2.h index 862de2879e..404af1f7d8 100644 --- a/io/bits/poll2.h +++ b/io/bits/poll2.h @@ -32,7 +32,7 @@ extern int __REDIRECT (__poll_chk_warn, (struct pollfd *__fds, nfds_t __nfds, __poll_chk) __warnattr ("poll called with fds buffer too small file nfds entries"); -__extern_always_inline int +__fortify_function int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout) { if (__bos (__fds) != (__SIZE_TYPE__) -1) @@ -61,7 +61,7 @@ extern int __REDIRECT (__ppoll_chk_warn, (struct pollfd *__fds, nfds_t __nfds, __ppoll_chk) __warnattr ("ppoll called with fds buffer too small file nfds entries"); -__extern_always_inline int +__fortify_function int ppoll (struct pollfd *__fds, nfds_t __nfds, const struct timespec *__timeout, const __sigset_t *__ss) { diff --git a/io/fcntl.h b/io/fcntl.h index 1192cf584c..8b8726a440 100644 --- a/io/fcntl.h +++ b/io/fcntl.h @@ -263,7 +263,7 @@ extern int posix_fallocate64 (int __fd, __off64_t __offset, __off64_t __len); /* Define some inlines helping to catch common problems. */ -#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline \ +#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function \ && defined __va_arg_pack_len # include <bits/fcntl2.h> #endif diff --git a/io/sys/poll.h b/io/sys/poll.h index 6089b618b6..9d78ff8360 100644 --- a/io/sys/poll.h +++ b/io/sys/poll.h @@ -72,7 +72,7 @@ __END_DECLS /* Define some inlines helping to catch common problems. */ -#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline +#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function # include <bits/poll2.h> #endif |