tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "<arpa/nameser.h>: fix INTRODUCED_IN API level."

Browse source 
am: 1069236349

Change-Id: I7024d4505b8075f05cacd013165d40ec7f7720b9
This commit is contained in:
Elliott Hughes 2019-06-06 14:26:45 -07:00 committed by android-build-merger
commit 5815427412
2 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
libc/include/arpa/nameser.h
View file

@ -591,33 +591,29 @@ int ns_samename(const char* __lhs, const char* __rhs);
/* The names of these symbols were accidentally prefixed with __ in L. */
/* The duplication here is intentional to avoid declaring different symbols with the same
* declaration. */
int ns_msg_getflag(ns_msg __handle, int __flag) __INTRODUCED_IN_64(23);
uint16_t ns_get16(const u_char* __src) __INTRODUCED_IN_64(23);
uint32_t ns_get32(const u_char* __src) __INTRODUCED_IN_64(23);
void ns_put16(uint16_t __src, u_char* __dst) __INTRODUCED_IN_64(23);
void ns_put32(uint32_t __src, u_char* __dst) __INTRODUCED_IN_64(23);
int ns_initparse(const u_char* __msg, int __msg_size, ns_msg* __handle) __INTRODUCED_IN_64(23);
int ns_skiprr(const u_char* __ptr, const u_char* __eom, ns_sect __section, int __count) __INTRODUCED_IN_64(23);
int ns_parserr(ns_msg* __handle, ns_sect __section, int __rr_number, ns_rr* __rr) __INTRODUCED_IN_64(23);
int ns_sprintrr(const ns_msg* __handle, const ns_rr* __rr, const char* __name_ctx, const char* __origin, char* __buf, size_t __buf_size)
__INTRODUCED_IN_64(23);
int ns_sprintrrf(const u_char* __msg, size_t __msg_size, const char* __name, ns_class __class, ns_type __type, u_long __ttl, const u_char* __rdata, size_t __rdata_size, const char* __name_ctx, const char* __origin, char* __buf, size_t __buf_size) __INTRODUCED_IN_64(23);
int ns_format_ttl(u_long __ttl, char* __dst, size_t __dst_size) __INTRODUCED_IN_64(23);
int ns_name_ntol(const u_char* __src, u_char* __dst, size_t __dst_size) __INTRODUCED_IN_64(23);
int ns_name_ntop(const u_char* __src, char* __dst, size_t __dst_size) __INTRODUCED_IN_64(23);
int ns_name_pton(const char* __src, u_char* __dst, size_t __dst_size) __INTRODUCED_IN_64(23);
int ns_name_unpack(const u_char* __msg, const u_char* __eom, const u_char* __src, u_char* __dst, size_t __dst_size)
__INTRODUCED_IN_64(23);
int ns_name_pack(const u_char* __src, u_char* __dst, int __dst_size, const u_char** __dn_ptrs, const u_char** __last_dn_ptr) __INTRODUCED_IN_64(23);
int ns_name_uncompress(const u_char* __msg, const u_char* __eom, const u_char* __src, char* __dst, size_t __dst_size)
__INTRODUCED_IN_64(23);
int ns_name_compress(const char* __src, u_char* __dst, size_t __dst_size, const u_char** __dn_ptrs, const u_char** __last_dn_ptr)
__INTRODUCED_IN_64(23);
int ns_name_skip(const u_char** __ptr_ptr, const u_char* __eom) __INTRODUCED_IN_64(23);
void ns_name_rollback(const u_char* __src, const u_char** __dn_ptrs, const u_char** __last_dn_ptr) __INTRODUCED_IN_64(23);
int ns_msg_getflag(ns_msg __handle, int __flag) __INTRODUCED_IN_64(22);
uint16_t ns_get16(const u_char* __src) __INTRODUCED_IN_64(22);
uint32_t ns_get32(const u_char* __src) __INTRODUCED_IN_64(22);
void ns_put16(uint16_t __src, u_char* __dst) __INTRODUCED_IN_64(22);
void ns_put32(uint32_t __src, u_char* __dst) __INTRODUCED_IN_64(22);
int ns_initparse(const u_char* __msg, int __msg_size, ns_msg* __handle) __INTRODUCED_IN_64(22);
int ns_skiprr(const u_char* __ptr, const u_char* __eom, ns_sect __section, int __count) __INTRODUCED_IN_64(22);
int ns_parserr(ns_msg* __handle, ns_sect __section, int __rr_number, ns_rr* __rr) __INTRODUCED_IN_64(22);
int ns_sprintrr(const ns_msg* __handle, const ns_rr* __rr, const char* __name_ctx, const char* __origin, char* __buf, size_t __buf_size) __INTRODUCED_IN_64(22);
int ns_sprintrrf(const u_char* __msg, size_t __msg_size, const char* __name, ns_class __class, ns_type __type, u_long __ttl, const u_char* __rdata, size_t __rdata_size, const char* __name_ctx, const char* __origin, char* __buf, size_t __buf_size) __INTRODUCED_IN_64(22);
int ns_format_ttl(u_long __ttl, char* __dst, size_t __dst_size) __INTRODUCED_IN_64(22);
int ns_name_ntol(const u_char* __src, u_char* __dst, size_t __dst_size) __INTRODUCED_IN_64(22);
int ns_name_ntop(const u_char* __src, char* __dst, size_t __dst_size) __INTRODUCED_IN_64(22);
int ns_name_pton(const char* __src, u_char* __dst, size_t __dst_size) __INTRODUCED_IN_64(22);
int ns_name_unpack(const u_char* __msg, const u_char* __eom, const u_char* __src, u_char* __dst, size_t __dst_size) __INTRODUCED_IN_64(22);
int ns_name_pack(const u_char* __src, u_char* __dst, int __dst_size, const u_char** __dn_ptrs, const u_char** __last_dn_ptr) __INTRODUCED_IN_64(22);
int ns_name_uncompress(const u_char* __msg, const u_char* __eom, const u_char* __src, char* __dst, size_t __dst_size) __INTRODUCED_IN_64(22);
int ns_name_compress(const char* __src, u_char* __dst, size_t __dst_size, const u_char** __dn_ptrs, const u_char** __last_dn_ptr) __INTRODUCED_IN_64(22);
int ns_name_skip(const u_char** __ptr_ptr, const u_char* __eom) __INTRODUCED_IN_64(22);
void ns_name_rollback(const u_char* __src, const u_char** __dn_ptrs, const u_char** __last_dn_ptr) __INTRODUCED_IN_64(22);
int ns_makecanon(const char* __src, char* __dst, size_t __dst_size) __INTRODUCED_IN_64(23);
int ns_samename(const char* __lhs, const char* __rhs) __INTRODUCED_IN_64(23);
int ns_makecanon(const char* __src, char* __dst, size_t __dst_size) __INTRODUCED_IN_64(22);
int ns_samename(const char* __lhs, const char* __rhs) __INTRODUCED_IN_64(22);
#endif /* !defined(__LP64__) */
__END_DECLS

2
libc/libc.map.txt
View file

@ -690,7 +690,7 @@ LIBC {
ns_name_ntol; # arm64 x86_64 mips64 introduced=22
ns_name_ntop; # arm64 x86_64 mips64 introduced=22
ns_name_pack; # arm64 x86_64 mips64 introduced=22
ns_name_pton; # arm64 x86_64 mips64 introduced=23
ns_name_pton; # arm64 x86_64 mips64 introduced=22
ns_name_rollback; # arm64 x86_64 mips64 introduced=22
ns_name_skip; # arm64 x86_64 mips64 introduced=22
ns_name_uncompress; # arm64 x86_64 mips64 introduced=22