From 07a2b29dd60aec5b7168e9b1f40c83ca5fa88362 Mon Sep 17 00:00:00 2001 From: Zijun Zhao Date: Fri, 12 May 2023 18:18:29 +0000 Subject: [PATCH] Revert "Nullability check for inet module." This reverts commit 53dbd78ae08969e119488997fedec56f17abf4e0. Reason for revert: Break build https://android-build.googleplex.com/builds/submitted/10125312/test_suites_x86_64_coverage/latest/view/logs/build_error.log?legacy Change-Id: Ifccf22768b916d85263abb89b2b4223ae2ce5d80 --- libc/include/arpa/inet.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libc/include/arpa/inet.h b/libc/include/arpa/inet.h index 748b7a14e..db054c9e1 100644 --- a/libc/include/arpa/inet.h +++ b/libc/include/arpa/inet.h @@ -36,17 +36,17 @@ __BEGIN_DECLS -in_addr_t inet_addr(const char* _Nonnull __s); -int inet_aton(const char* _Nonnull __s, struct in_addr* _Nullable __addr); +in_addr_t inet_addr(const char* __s); +int inet_aton(const char* __s, struct in_addr* __addr); in_addr_t inet_lnaof(struct in_addr __addr) __INTRODUCED_IN(21); struct in_addr inet_makeaddr(in_addr_t __net, in_addr_t __host) __INTRODUCED_IN(21); in_addr_t inet_netof(struct in_addr __addr) __INTRODUCED_IN(21); -in_addr_t inet_network(const char* _Nonnull __s) __INTRODUCED_IN(21); -char* _Nonnull inet_ntoa(struct in_addr __addr); -const char* _Nullable inet_ntop(int __af, const void* _Nonnull __src, char* _Nonnull __dst, socklen_t __size); -unsigned int inet_nsap_addr(const char* _Nonnull __ascii, unsigned char* _Nonnull __binary, int __n); -char* _Nonnull inet_nsap_ntoa(int __binary_length, const unsigned char* _Nonnull __binary, char* _Nullable __ascii); -int inet_pton(int __af, const char* _Nonnull __src, void* _Nonnull __dst); +in_addr_t inet_network(const char* __s) __INTRODUCED_IN(21); +char* inet_ntoa(struct in_addr __addr); +const char* inet_ntop(int __af, const void* __src, char* __dst, socklen_t __size); +unsigned int inet_nsap_addr(const char* __ascii, unsigned char* __binary, int __n); +char* inet_nsap_ntoa(int __binary_length, const unsigned char* __binary, char* __ascii); +int inet_pton(int __af, const char* __src, void* __dst); __END_DECLS