diff options
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/strings.h b/include/strings.h index 6886ddc..511acca 100644 --- a/include/strings.h +++ b/include/strings.h | |||
| @@ -31,8 +31,8 @@ extern "C" { | |||
| 31 | || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700) | 31 | || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700) |
| 32 | #undef bcopy | 32 | #undef bcopy |
| 33 | #undef bzero | 33 | #undef bzero |
| 34 | __access(write_only, 2, 3) | 34 | __fh_access(write_only, 2, 3) |
| 35 | __access(read_only, 1, 3) | 35 | __fh_access(read_only, 1, 3) |
| 36 | #if __has_builtin(__builtin_bcopy) && !defined(__clang__) | 36 | #if __has_builtin(__builtin_bcopy) && !defined(__clang__) |
| 37 | // parameter 1 of function '__orig_bcopy' has type 'const void *', but parameter 1 of function '__builtin_bcopy' has type 'void *' | 37 | // parameter 1 of function '__orig_bcopy' has type 'const void *', but parameter 1 of function '__builtin_bcopy' has type 'void *' |
| 38 | __diagnose_as_builtin(__builtin_bcopy, 1, 2, 3) | 38 | __diagnose_as_builtin(__builtin_bcopy, 1, 2, 3) |
| @@ -40,21 +40,21 @@ __diagnose_as_builtin(__builtin_bcopy, 1, 2, 3) | |||
| 40 | _FORTIFY_FN(bcopy) void bcopy(const void * _FORTIFY_POS0 __s, | 40 | _FORTIFY_FN(bcopy) void bcopy(const void * _FORTIFY_POS0 __s, |
| 41 | void * _FORTIFY_POS0 __d, size_t __n) | 41 | void * _FORTIFY_POS0 __d, size_t __n) |
| 42 | { | 42 | { |
| 43 | __fh_size_t __bd = __bos(__d, 0); | 43 | __fh_size_t __bd = __fh_bos(__d, 0); |
| 44 | __fh_size_t __bs = __bos(__s, 0); | 44 | __fh_size_t __bs = __fh_bos(__s, 0); |
| 45 | 45 | ||
| 46 | if (__n > __bd || __n > __bs) | 46 | if (__n > __bd || __n > __bs) |
| 47 | __builtin_trap(); | 47 | __builtin_trap(); |
| 48 | return __orig_bcopy(__s, __d, __n); | 48 | return __orig_bcopy(__s, __d, __n); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | __access(write_only, 1, 2) | 51 | __fh_access(write_only, 1, 2) |
| 52 | #if __has_builtin(__builtin_bzero) | 52 | #if __has_builtin(__builtin_bzero) |
| 53 | __diagnose_as_builtin(__builtin_bzero, 1, 2) | 53 | __diagnose_as_builtin(__builtin_bzero, 1, 2) |
| 54 | #endif | 54 | #endif |
| 55 | _FORTIFY_FN(bzero) void bzero(void * _FORTIFY_POS0 __s, size_t __n) | 55 | _FORTIFY_FN(bzero) void bzero(void * _FORTIFY_POS0 __s, size_t __n) |
| 56 | { | 56 | { |
| 57 | __fh_size_t __b = __bos(__s, 0); | 57 | __fh_size_t __b = __fh_bos(__s, 0); |
| 58 | 58 | ||
| 59 | if (__n > __b) | 59 | if (__n > __b) |
| 60 | __builtin_trap(); | 60 | __builtin_trap(); |
