diff options
| author | Trutz Behn | 2015-06-03 19:27:01 +0200 |
|---|---|---|
| committer | sin | 2015-06-03 18:55:35 +0100 |
| commit | 1cd5461a5375207602f2cbdfd9a50a9b751cb7c8 (patch) | |
| tree | f83f8a0ccb05715aadef4d2bcc770c93ea0b97ec /include/strings.h | |
| parent | a9ee1d2743acb0b2903db87c0a241c0a569cfc4e (diff) | |
Use namespace-safe macro, param and variable names
Diffstat (limited to '')
| -rw-r--r-- | include/strings.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/strings.h b/include/strings.h index ed8efdb..4eb5486 100644 --- a/include/strings.h +++ b/include/strings.h | |||
| @@ -30,23 +30,23 @@ extern "C" { | |||
| 30 | || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700) | 30 | || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700) |
| 31 | #undef bcopy | 31 | #undef bcopy |
| 32 | #undef bzero | 32 | #undef bzero |
| 33 | fortify_fn(bcopy) void bcopy(const void *src, void *dst, size_t n) | 33 | _FORTIFY_FN(bcopy) void bcopy(const void *__s, void *__d, size_t __n) |
| 34 | { | 34 | { |
| 35 | size_t bos_dst = __builtin_object_size(dst, 0); | 35 | size_t __bd = __builtin_object_size(__d, 0); |
| 36 | size_t bos_src = __builtin_object_size(src, 0); | 36 | size_t __bs = __builtin_object_size(__s, 0); |
| 37 | 37 | ||
| 38 | if (n > bos_dst || n > bos_src) | 38 | if (__n > __bd || __n > __bs) |
| 39 | __builtin_trap(); | 39 | __builtin_trap(); |
| 40 | return __orig_bcopy(src, dst, n); | 40 | return __orig_bcopy(__s, __d, __n); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | fortify_fn(bzero) void bzero(void *src, size_t n) | 43 | _FORTIFY_FN(bzero) void bzero(void *__s, size_t __n) |
| 44 | { | 44 | { |
| 45 | size_t bos = __builtin_object_size(src, 0); | 45 | size_t __b = __builtin_object_size(__s, 0); |
| 46 | 46 | ||
| 47 | if (n > bos) | 47 | if (__n > __b) |
| 48 | __builtin_trap(); | 48 | __builtin_trap(); |
| 49 | return __orig_bzero(src, n); | 49 | return __orig_bzero(__s, __n); |
| 50 | } | 50 | } |
| 51 | #endif | 51 | #endif |
| 52 | 52 | ||
