diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-17 07:16:21 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-17 07:16:21 +0000 |
commit | 3d97ce54124cc0911dd4ace4766842d4c1e11c75 (patch) | |
tree | d8e24f25ff687d25704ee2a45ab5e25159e08cac | |
parent | e2df1f5b317b51e7a2a77c16763f14368a408caf (diff) | |
parent | 2f7f57d587f1c6a1b0d02bbe0580ec18859993fc (diff) | |
download | toybox-android13-mainline-conscrypt-release.tar.gz |
Snap for 8603585 from 2f7f57d587f1c6a1b0d02bbe0580ec18859993fc to mainline-conscrypt-releaseaml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010android13-mainline-conscrypt-release
Change-Id: I50ae3d09f09a9a8cea5884012b8c0f1ea3b12a22
-rw-r--r-- | lib/lib.h | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -114,8 +114,8 @@ struct dirtree *dirtree_read(char *path, int (*callback)(struct dirtree *node)); // xwrap.c void xstrncpy(char *dest, char *src, size_t size); void xstrncat(char *dest, char *src, size_t size); -void _xexit(void) __attribute__((__noreturn__)); -void xexit(void) __attribute__((__noreturn__)); +_Noreturn void _xexit(void); +_Noreturn void xexit(void); void *xmmap(void *addr, size_t length, int prot, int flags, int fd, off_t off); void *xmalloc(size_t size); void *xzalloc(size_t size); @@ -194,13 +194,13 @@ time_t xmktime(struct tm *tm, int utc); void verror_msg(char *msg, int err, va_list va); void error_msg(char *msg, ...) printf_format; void perror_msg(char *msg, ...) printf_format; -void error_exit(char *msg, ...) printf_format __attribute__((__noreturn__)); -void perror_exit(char *msg, ...) printf_format __attribute__((__noreturn__)); -void help_exit(char *msg, ...) printf_format __attribute__((__noreturn__)); +_Noreturn void error_exit(char *msg, ...) printf_format; +_Noreturn void perror_exit(char *msg, ...) printf_format; +_Noreturn void help_exit(char *msg, ...) printf_format; void error_msg_raw(char *msg); void perror_msg_raw(char *msg); -void error_exit_raw(char *msg) __attribute__((__noreturn__)); -void perror_exit_raw(char *msg) __attribute__((__noreturn__)); +_Noreturn void error_exit_raw(char *msg); +_Noreturn void perror_exit_raw(char *msg); ssize_t readall(int fd, void *buf, size_t len); ssize_t writeall(int fd, void *buf, size_t len); off_t lskip(int fd, off_t offset); |