diff options
| author | Nick Kralevich <nnk@google.com> | 2013-06-18 13:07:18 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2013-06-18 13:07:18 -0700 |
| commit | a641c18f0c62c31f5678f8c159a74486010ea851 (patch) | |
| tree | 58f89487d51470e9748495461b97f1e776859fe6 /libc/include/fcntl.h | |
| parent | 16d1af167f8e36a9aa4a07ae77034ad519b00463 (diff) | |
| download | android_bionic-a641c18f0c62c31f5678f8c159a74486010ea851.tar.gz android_bionic-a641c18f0c62c31f5678f8c159a74486010ea851.tar.bz2 android_bionic-a641c18f0c62c31f5678f8c159a74486010ea851.zip | |
libc: Rename fortify error functions.
__umask_error -> __umask_invalid_mode
__creat_error -> __creat_missing_mode
__too_many_args_error -> __creat_too_many_args
Change-Id: I4036f344a3a93628e70f2e948ad73cfed3a967ea
Diffstat (limited to 'libc/include/fcntl.h')
| -rw-r--r-- | libc/include/fcntl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libc/include/fcntl.h b/libc/include/fcntl.h index 94322fd71..3cb3d8ab0 100644 --- a/libc/include/fcntl.h +++ b/libc/include/fcntl.h @@ -50,8 +50,8 @@ extern int fcntl(int fd, int command, ...); extern int creat(const char* path, mode_t mode); #if defined(__BIONIC_FORTIFY) && !defined(__clang__) -__errordecl(__creat_error, "called with O_CREAT, but missing mode"); -__errordecl(__too_many_args_error, "too many arguments"); +__errordecl(__creat_missing_mode, "called with O_CREAT, but missing mode"); +__errordecl(__creat_too_many_args, "too many arguments"); extern int __open_real(const char *pathname, int flags, ...) __asm__(__USER_LABEL_PREFIX__ "open"); extern int __open_2(const char *, int); @@ -60,12 +60,12 @@ __BIONIC_FORTIFY_INLINE int open(const char *pathname, int flags, ...) { if (__builtin_constant_p(flags)) { if ((flags & O_CREAT) && __builtin_va_arg_pack_len() == 0) { - __creat_error(); // compile time error + __creat_missing_mode(); // compile time error } } if (__builtin_va_arg_pack_len() > 1) { - __too_many_args_error(); // compile time error + __creat_too_many_args(); // compile time error } if ((__builtin_va_arg_pack_len() == 0) && !__builtin_constant_p(flags)) { @@ -83,12 +83,12 @@ __BIONIC_FORTIFY_INLINE int openat(int dirfd, const char *pathname, int flags, ...) { if (__builtin_constant_p(flags)) { if ((flags & O_CREAT) && __builtin_va_arg_pack_len() == 0) { - __creat_error(); // compile time error + __creat_missing_mode(); // compile time error } } if (__builtin_va_arg_pack_len() > 1) { - __too_many_args_error(); // compile time error + __creat_too_many_args(); // compile time error } if ((__builtin_va_arg_pack_len() == 0) && !__builtin_constant_p(flags)) { |