Skip to content

Commit ac54490

Browse files
BethGriggsBethGriggs
committed
deps: reflect c-ares source tree
c-ares refactored their source tree in 1.17.0 which we did not apply in our update to 1.17.1. This commit syncs our source with their new structure for easier maintenance going forward. cares.gyp is updated accordingly. Refs: c-ares/c-ares#349 Refs: #36207 PR-URL: #39653 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent a914b23 commit ac54490

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+79
-79
lines changed

Diff for: ‎deps/cares/src/AUTHORS renamed to ‎deps/cares/AUTHORS

File renamed without changes.

Diff for: ‎deps/cares/src/NEWS renamed to ‎deps/cares/NEWS

File renamed without changes.

Diff for: ‎deps/cares/src/README.cares renamed to ‎deps/cares/README.cares

File renamed without changes.

Diff for: ‎deps/cares/src/README.md renamed to ‎deps/cares/README.md

Diff for: ‎deps/cares/src/README.msvc renamed to ‎deps/cares/README.msvc

File renamed without changes.

Diff for: ‎deps/cares/src/RELEASE-NOTES renamed to ‎deps/cares/RELEASE-NOTES

File renamed without changes.

Diff for: ‎deps/cares/src/TODO renamed to ‎deps/cares/TODO

File renamed without changes.

Diff for: ‎deps/cares/cares.gyp

+79-79
Original file line numberDiff line numberDiff line change
@@ -30,86 +30,86 @@
3030
{
3131
'target_name': 'cares',
3232
'type': '<(library)',
33-
'include_dirs': [ 'include', 'src' ],
33+
'include_dirs': [ 'include', 'src/lib' ],
3434
'direct_dependent_settings': {
35-
'include_dirs': [ 'include' ]
35+
'include_dirs': [ 'include', 'src/lib' ]
3636
},
3737
'sources': [
3838
'include/ares.h',
39+
'include/ares_dns.h',
3940
'include/ares_rules.h',
4041
'include/ares_version.h',
41-
'include/nameser.h',
42-
'src/ares_android.c',
43-
'src/ares_cancel.c',
44-
'src/ares__close_sockets.c',
45-
'src/ares_create_query.c',
46-
'src/ares_data.c',
47-
'src/ares_data.h',
48-
'src/ares_destroy.c',
49-
'src/ares_dns.h',
50-
'src/ares_expand_name.c',
51-
'src/ares_expand_string.c',
52-
'src/ares_fds.c',
53-
'src/ares_free_hostent.c',
54-
'src/ares_free_string.c',
55-
'src/ares_freeaddrinfo.c',
56-
'src/ares_getenv.h',
57-
'src/ares_getaddrinfo.c',
58-
'src/ares_gethostbyaddr.c',
59-
'src/ares_gethostbyname.c',
60-
'src/ares__get_hostent.c',
61-
'src/ares_getnameinfo.c',
62-
'src/ares_getopt.c',
63-
'src/ares_getopt.h',
64-
'src/ares_getsock.c',
65-
'src/ares_init.c',
66-
'src/ares_ipv6.h',
67-
'src/ares_library_init.c',
68-
'src/ares_library_init.h',
69-
'src/ares_llist.c',
70-
'src/ares_llist.h',
71-
'src/ares_mkquery.c',
72-
'src/ares_nowarn.c',
73-
'src/ares_nowarn.h',
74-
'src/ares_options.c',
75-
'src/ares__parse_into_addrinfo.c',
76-
'src/ares_parse_aaaa_reply.c',
77-
'src/ares_parse_a_reply.c',
78-
'src/ares_parse_caa_reply.c',
79-
'src/ares_parse_mx_reply.c',
80-
'src/ares_parse_naptr_reply.c',
81-
'src/ares_parse_ns_reply.c',
82-
'src/ares_parse_ptr_reply.c',
83-
'src/ares_parse_soa_reply.c',
84-
'src/ares_parse_srv_reply.c',
85-
'src/ares_parse_txt_reply.c',
86-
'src/ares_platform.h',
87-
'src/ares_private.h',
88-
'src/ares_process.c',
89-
'src/ares_query.c',
90-
'src/ares__read_line.c',
91-
'src/ares__readaddrinfo.c',
92-
'src/ares_search.c',
93-
'src/ares_send.c',
94-
'src/ares_setup.h',
95-
'src/ares__sortaddrinfo.c',
96-
'src/ares_strcasecmp.c',
97-
'src/ares_strcasecmp.h',
98-
'src/ares_strdup.c',
99-
'src/ares_strdup.h',
100-
'src/ares_strerror.c',
101-
'src/ares_strsplit.c',
102-
'src/ares_timeout.c',
103-
'src/ares__timeval.c',
104-
'src/ares_version.c',
105-
'src/ares_writev.c',
106-
'src/ares_writev.h',
107-
'src/bitncmp.c',
108-
'src/bitncmp.h',
109-
'src/inet_net_pton.c',
110-
'src/inet_ntop.c',
111-
'src/ares_inet_net_pton.h',
112-
'src/setup_once.h',
42+
'src/lib/ares_android.c',
43+
'src/lib/ares_cancel.c',
44+
'src/lib/ares__close_sockets.c',
45+
'src/lib/ares_create_query.c',
46+
'src/lib/ares_data.c',
47+
'src/lib/ares_data.h',
48+
'src/lib/ares_destroy.c',
49+
'src/lib/ares_expand_name.c',
50+
'src/lib/ares_expand_string.c',
51+
'src/lib/ares_fds.c',
52+
'src/lib/ares_free_hostent.c',
53+
'src/lib/ares_free_string.c',
54+
'src/lib/ares_freeaddrinfo.c',
55+
'src/lib/ares_getenv.h',
56+
'src/lib/ares_getaddrinfo.c',
57+
'src/lib/ares_gethostbyaddr.c',
58+
'src/lib/ares_gethostbyname.c',
59+
'src/lib/ares__get_hostent.c',
60+
'src/lib/ares_getnameinfo.c',
61+
'src/lib/ares_getsock.c',
62+
'src/lib/ares_init.c',
63+
'src/lib/ares_ipv6.h',
64+
'src/lib/ares_library_init.c',
65+
'src/lib/ares_library_init.h',
66+
'src/lib/ares_llist.c',
67+
'src/lib/ares_llist.h',
68+
'src/lib/ares_mkquery.c',
69+
'src/lib/ares_nowarn.c',
70+
'src/lib/ares_nowarn.h',
71+
'src/lib/ares_options.c',
72+
'src/lib/ares__parse_into_addrinfo.c',
73+
'src/lib/ares_parse_aaaa_reply.c',
74+
'src/lib/ares_parse_a_reply.c',
75+
'src/lib/ares_parse_caa_reply.c',
76+
'src/lib/ares_parse_mx_reply.c',
77+
'src/lib/ares_parse_naptr_reply.c',
78+
'src/lib/ares_parse_ns_reply.c',
79+
'src/lib/ares_parse_ptr_reply.c',
80+
'src/lib/ares_parse_soa_reply.c',
81+
'src/lib/ares_parse_srv_reply.c',
82+
'src/lib/ares_parse_txt_reply.c',
83+
'src/lib/ares_platform.h',
84+
'src/lib/ares_private.h',
85+
'src/lib/ares_process.c',
86+
'src/lib/ares_query.c',
87+
'src/lib/ares__read_line.c',
88+
'src/lib/ares__readaddrinfo.c',
89+
'src/lib/ares_search.c',
90+
'src/lib/ares_send.c',
91+
'src/lib/ares_setup.h',
92+
'src/lib/ares__sortaddrinfo.c',
93+
'src/lib/ares_strcasecmp.c',
94+
'src/lib/ares_strcasecmp.h',
95+
'src/lib/ares_strdup.c',
96+
'src/lib/ares_strdup.h',
97+
'src/lib/ares_strerror.c',
98+
'src/lib/ares_strsplit.c',
99+
'src/lib/ares_timeout.c',
100+
'src/lib/ares__timeval.c',
101+
'src/lib/ares_version.c',
102+
'src/lib/ares_writev.c',
103+
'src/lib/ares_writev.h',
104+
'src/lib/bitncmp.c',
105+
'src/lib/bitncmp.h',
106+
'src/lib/inet_net_pton.c',
107+
'src/lib/inet_ntop.c',
108+
'src/lib/ares_inet_net_pton.h',
109+
'src/lib/nameser.h',
110+
'src/lib/setup_once.h',
111+
'src/tools/ares_getopt.c',
112+
'src/tools/ares_getopt.h',
113113
],
114114
'conditions': [
115115
[ 'library=="static_library"', {
@@ -124,11 +124,11 @@
124124
],
125125
'include_dirs': [ 'config/win32' ],
126126
'sources': [
127-
'src/config-win32.h',
128-
'src/windows_port.c',
129-
'src/ares_getenv.c',
130-
'src/ares_iphlpapi.h',
131-
'src/ares_platform.c'
127+
'src/lib/config-win32.h',
128+
'src/lib/windows_port.c',
129+
'src/lib/ares_getenv.c',
130+
'src/lib/ares_iphlpapi.h',
131+
'src/lib/ares_platform.c'
132132
],
133133
'libraries': [
134134
'-lws2_32.lib',

Diff for: ‎deps/cares/src/ares_dns.h renamed to ‎deps/cares/include/ares_dns.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares__close_sockets.c renamed to ‎deps/cares/src/lib/ares__close_sockets.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares__get_hostent.c renamed to ‎deps/cares/src/lib/ares__get_hostent.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares__parse_into_addrinfo.c renamed to ‎deps/cares/src/lib/ares__parse_into_addrinfo.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares__read_line.c renamed to ‎deps/cares/src/lib/ares__read_line.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares__readaddrinfo.c renamed to ‎deps/cares/src/lib/ares__readaddrinfo.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares__sortaddrinfo.c renamed to ‎deps/cares/src/lib/ares__sortaddrinfo.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares__timeval.c renamed to ‎deps/cares/src/lib/ares__timeval.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_android.c renamed to ‎deps/cares/src/lib/ares_android.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_android.h renamed to ‎deps/cares/src/lib/ares_android.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_cancel.c renamed to ‎deps/cares/src/lib/ares_cancel.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_create_query.c renamed to ‎deps/cares/src/lib/ares_create_query.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_data.c renamed to ‎deps/cares/src/lib/ares_data.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_data.h renamed to ‎deps/cares/src/lib/ares_data.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_destroy.c renamed to ‎deps/cares/src/lib/ares_destroy.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_expand_name.c renamed to ‎deps/cares/src/lib/ares_expand_name.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_expand_string.c renamed to ‎deps/cares/src/lib/ares_expand_string.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_fds.c renamed to ‎deps/cares/src/lib/ares_fds.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_free_hostent.c renamed to ‎deps/cares/src/lib/ares_free_hostent.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_free_string.c renamed to ‎deps/cares/src/lib/ares_free_string.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_freeaddrinfo.c renamed to ‎deps/cares/src/lib/ares_freeaddrinfo.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_getaddrinfo.c renamed to ‎deps/cares/src/lib/ares_getaddrinfo.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_getenv.c renamed to ‎deps/cares/src/lib/ares_getenv.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_getenv.h renamed to ‎deps/cares/src/lib/ares_getenv.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_gethostbyaddr.c renamed to ‎deps/cares/src/lib/ares_gethostbyaddr.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_gethostbyname.c renamed to ‎deps/cares/src/lib/ares_gethostbyname.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_getnameinfo.c renamed to ‎deps/cares/src/lib/ares_getnameinfo.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_getsock.c renamed to ‎deps/cares/src/lib/ares_getsock.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_inet_net_pton.h renamed to ‎deps/cares/src/lib/ares_inet_net_pton.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_init.c renamed to ‎deps/cares/src/lib/ares_init.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_iphlpapi.h renamed to ‎deps/cares/src/lib/ares_iphlpapi.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_ipv6.h renamed to ‎deps/cares/src/lib/ares_ipv6.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_library_init.c renamed to ‎deps/cares/src/lib/ares_library_init.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_library_init.h renamed to ‎deps/cares/src/lib/ares_library_init.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_llist.c renamed to ‎deps/cares/src/lib/ares_llist.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_llist.h renamed to ‎deps/cares/src/lib/ares_llist.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_mkquery.c renamed to ‎deps/cares/src/lib/ares_mkquery.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_nowarn.c renamed to ‎deps/cares/src/lib/ares_nowarn.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_nowarn.h renamed to ‎deps/cares/src/lib/ares_nowarn.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_options.c renamed to ‎deps/cares/src/lib/ares_options.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_a_reply.c renamed to ‎deps/cares/src/lib/ares_parse_a_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_aaaa_reply.c renamed to ‎deps/cares/src/lib/ares_parse_aaaa_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_caa_reply.c renamed to ‎deps/cares/src/lib/ares_parse_caa_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_mx_reply.c renamed to ‎deps/cares/src/lib/ares_parse_mx_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_naptr_reply.c renamed to ‎deps/cares/src/lib/ares_parse_naptr_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_ns_reply.c renamed to ‎deps/cares/src/lib/ares_parse_ns_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_ptr_reply.c renamed to ‎deps/cares/src/lib/ares_parse_ptr_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_soa_reply.c renamed to ‎deps/cares/src/lib/ares_parse_soa_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_srv_reply.c renamed to ‎deps/cares/src/lib/ares_parse_srv_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_parse_txt_reply.c renamed to ‎deps/cares/src/lib/ares_parse_txt_reply.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_platform.c renamed to ‎deps/cares/src/lib/ares_platform.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_platform.h renamed to ‎deps/cares/src/lib/ares_platform.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_private.h renamed to ‎deps/cares/src/lib/ares_private.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_process.c renamed to ‎deps/cares/src/lib/ares_process.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_query.c renamed to ‎deps/cares/src/lib/ares_query.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_search.c renamed to ‎deps/cares/src/lib/ares_search.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_send.c renamed to ‎deps/cares/src/lib/ares_send.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_setup.h renamed to ‎deps/cares/src/lib/ares_setup.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_strcasecmp.c renamed to ‎deps/cares/src/lib/ares_strcasecmp.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_strcasecmp.h renamed to ‎deps/cares/src/lib/ares_strcasecmp.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_strdup.c renamed to ‎deps/cares/src/lib/ares_strdup.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_strdup.h renamed to ‎deps/cares/src/lib/ares_strdup.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_strerror.c renamed to ‎deps/cares/src/lib/ares_strerror.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_strsplit.c renamed to ‎deps/cares/src/lib/ares_strsplit.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_strsplit.h renamed to ‎deps/cares/src/lib/ares_strsplit.h

File renamed without changes.

Diff for: ‎deps/cares/src/ares_timeout.c renamed to ‎deps/cares/src/lib/ares_timeout.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_version.c renamed to ‎deps/cares/src/lib/ares_version.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_writev.c renamed to ‎deps/cares/src/lib/ares_writev.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_writev.h renamed to ‎deps/cares/src/lib/ares_writev.h

File renamed without changes.

Diff for: ‎deps/cares/src/bitncmp.c renamed to ‎deps/cares/src/lib/bitncmp.c

File renamed without changes.

Diff for: ‎deps/cares/src/bitncmp.h renamed to ‎deps/cares/src/lib/bitncmp.h

File renamed without changes.

Diff for: ‎deps/cares/src/config-win32.h renamed to ‎deps/cares/src/lib/config-win32.h

File renamed without changes.

Diff for: ‎deps/cares/src/inet_net_pton.c renamed to ‎deps/cares/src/lib/inet_net_pton.c

File renamed without changes.

Diff for: ‎deps/cares/src/inet_ntop.c renamed to ‎deps/cares/src/lib/inet_ntop.c

File renamed without changes.

Diff for: ‎deps/cares/include/nameser.h renamed to ‎deps/cares/src/lib/nameser.h

File renamed without changes.

Diff for: ‎deps/cares/src/setup_once.h renamed to ‎deps/cares/src/lib/setup_once.h

File renamed without changes.

Diff for: ‎deps/cares/src/windows_port.c renamed to ‎deps/cares/src/lib/windows_port.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_getopt.c renamed to ‎deps/cares/src/tools/ares_getopt.c

File renamed without changes.

Diff for: ‎deps/cares/src/ares_getopt.h renamed to ‎deps/cares/src/tools/ares_getopt.h

File renamed without changes.

0 commit comments

Comments
 (0)