authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-21 10:26:41-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-29 06:20:51-07:00
logdab8dd5e0306af4ef9b2388cfa8012ea596920ae
tree9a1d3733b0a63a76a333195f3753636c886632cb
parent0107e584ef4c8071b9ab71f20aae83a5cfb91921

std.os.windows.ws2_32: remove 'A' variants

1 files changed, 11 insertions(+), 113 deletions(-)

lib/std/os/windows/ws2_32.zig+11-113
......@@ -1080,31 +1080,18 @@ pub const WSANETWORKEVENTS = extern struct {
10801080 iErrorCode: [10]i32,
10811081};
10821082
1083pub const addrinfo = addrinfoa;
1084
1085pub const addrinfoa = extern struct {
1086 flags: AI,
1087 family: i32,
1088 socktype: i32,
1089 protocol: i32,
1090 addrlen: usize,
1091 canonname: ?[*:0]u8,
1092 addr: ?*sockaddr,
1093 next: ?*addrinfo,
1094};
1095
1096pub const addrinfoexA = extern struct {
1083pub const ADDRINFOEXW = extern struct {
10971084 flags: AI,
10981085 family: i32,
10991086 socktype: i32,
11001087 protocol: i32,
11011088 addrlen: usize,
1102 canonname: [*:0]u8,
1089 canonname: [*:0]u16,
11031090 addr: *sockaddr,
11041091 blob: *anyopaque,
11051092 bloblen: usize,
11061093 provider: *GUID,
1107 next: *addrinfoexA,
1094 next: *ADDRINFOEXW,
11081095};
11091096
11101097pub const sockaddr = extern struct {
......@@ -1851,18 +1838,6 @@ pub extern "ws2_32" fn WSAConnectByNameW(
18511838 Reserved: *OVERLAPPED,
18521839) callconv(.winapi) BOOL;
18531840
1854pub extern "ws2_32" fn WSAConnectByNameA(
1855 s: SOCKET,
1856 nodename: [*:0]const u8,
1857 servicename: [*:0]const u8,
1858 LocalAddressLength: ?*u32,
1859 LocalAddress: ?*sockaddr,
1860 RemoteAddressLength: ?*u32,
1861 RemoteAddress: ?*sockaddr,
1862 timeout: ?*const timeval,
1863 Reserved: *OVERLAPPED,
1864) callconv(.winapi) BOOL;
1865
18661841pub extern "ws2_32" fn WSAConnectByList(
18671842 s: SOCKET,
18681843 SocketAddress: *SOCKET_ADDRESS_LIST,
......@@ -1876,12 +1851,6 @@ pub extern "ws2_32" fn WSAConnectByList(
18761851
18771852pub extern "ws2_32" fn WSACreateEvent() callconv(.winapi) HANDLE;
18781853
1879pub extern "ws2_32" fn WSADuplicateSocketA(
1880 s: SOCKET,
1881 dwProcessId: u32,
1882 lpProtocolInfo: *WSAPROTOCOL_INFOA,
1883) callconv(.winapi) i32;
1884
18851854pub extern "ws2_32" fn WSADuplicateSocketW(
18861855 s: SOCKET,
18871856 dwProcessId: u32,
......@@ -1894,12 +1863,6 @@ pub extern "ws2_32" fn WSAEnumNetworkEvents(
18941863 lpNetworkEvents: *WSANETWORKEVENTS,
18951864) callconv(.winapi) i32;
18961865
1897pub extern "ws2_32" fn WSAEnumProtocolsA(
1898 lpiProtocols: ?*i32,
1899 lpProtocolBuffer: ?*WSAPROTOCOL_INFOA,
1900 lpdwBufferLength: *u32,
1901) callconv(.winapi) i32;
1902
19031866pub extern "ws2_32" fn WSAEnumProtocolsW(
19041867 lpiProtocols: ?*i32,
19051868 lpProtocolBuffer: ?*WSAPROTOCOL_INFOW,
......@@ -2042,15 +2005,6 @@ pub extern "ws2_32" fn WSASetEvent(
20422005 hEvent: HANDLE,
20432006) callconv(.winapi) BOOL;
20442007
2045pub extern "ws2_32" fn WSASocketA(
2046 af: i32,
2047 @"type": i32,
2048 protocol: i32,
2049 lpProtocolInfo: ?*WSAPROTOCOL_INFOA,
2050 g: u32,
2051 dwFlags: u32,
2052) callconv(.winapi) SOCKET;
2053
20542008pub extern "ws2_32" fn WSASocketW(
20552009 af: i32,
20562010 @"type": i32,
......@@ -2068,14 +2022,6 @@ pub extern "ws2_32" fn WSAWaitForMultipleEvents(
20682022 fAlertable: BOOL,
20692023) callconv(.winapi) u32;
20702024
2071pub extern "ws2_32" fn WSAAddressToStringA(
2072 lpsaAddress: *sockaddr,
2073 dwAddressLength: u32,
2074 lpProtocolInfo: ?*WSAPROTOCOL_INFOA,
2075 lpszAddressString: [*]u8,
2076 lpdwAddressStringLength: *u32,
2077) callconv(.winapi) i32;
2078
20792025pub extern "ws2_32" fn WSAAddressToStringW(
20802026 lpsaAddress: *sockaddr,
20812027 dwAddressLength: u32,
......@@ -2084,14 +2030,6 @@ pub extern "ws2_32" fn WSAAddressToStringW(
20842030 lpdwAddressStringLength: *u32,
20852031) callconv(.winapi) i32;
20862032
2087pub extern "ws2_32" fn WSAStringToAddressA(
2088 AddressString: [*:0]const u8,
2089 AddressFamily: i32,
2090 lpProtocolInfo: ?*WSAPROTOCOL_INFOA,
2091 lpAddress: *sockaddr,
2092 lpAddressLength: *i32,
2093) callconv(.winapi) i32;
2094
20952033pub extern "ws2_32" fn WSAStringToAddressW(
20962034 AddressString: [*:0]const u16,
20972035 AddressFamily: i32,
......@@ -2156,30 +2094,12 @@ pub extern "ws2_32" fn WSAProviderCompleteAsyncCall(
21562094 iRetCode: i32,
21572095) callconv(.winapi) i32;
21582096
2159pub extern "mswsock" fn EnumProtocolsA(
2160 lpiProtocols: ?*i32,
2161 lpProtocolBuffer: *anyopaque,
2162 lpdwBufferLength: *u32,
2163) callconv(.winapi) i32;
2164
21652097pub extern "mswsock" fn EnumProtocolsW(
21662098 lpiProtocols: ?*i32,
21672099 lpProtocolBuffer: *anyopaque,
21682100 lpdwBufferLength: *u32,
21692101) callconv(.winapi) i32;
21702102
2171pub extern "mswsock" fn GetAddressByNameA(
2172 dwNameSpace: u32,
2173 lpServiceType: *GUID,
2174 lpServiceName: ?[*:0]u8,
2175 lpiProtocols: ?*i32,
2176 dwResolution: u32,
2177 lpServiceAsyncInfo: ?*SERVICE_ASYNC_INFO,
2178 lpCsaddrBuffer: *anyopaque,
2179 lpAliasBuffer: ?[*:0]const u8,
2180 lpdwAliasBufferLength: *u32,
2181) callconv(.winapi) i32;
2182
21832103pub extern "mswsock" fn GetAddressByNameW(
21842104 dwNameSpace: u32,
21852105 lpServiceType: *GUID,
......@@ -2193,42 +2113,24 @@ pub extern "mswsock" fn GetAddressByNameW(
21932113 lpdwAliasBufferLength: *u32,
21942114) callconv(.winapi) i32;
21952115
2196pub extern "mswsock" fn GetTypeByNameA(
2197 lpServiceName: [*:0]u8,
2198 lpServiceType: *GUID,
2199) callconv(.winapi) i32;
2200
22012116pub extern "mswsock" fn GetTypeByNameW(
22022117 lpServiceName: [*:0]u16,
22032118 lpServiceType: *GUID,
22042119) callconv(.winapi) i32;
22052120
2206pub extern "mswsock" fn GetNameByTypeA(
2207 lpServiceType: *GUID,
2208 lpServiceName: [*:0]u8,
2209 dwNameLength: u32,
2210) callconv(.winapi) i32;
2211
22122121pub extern "mswsock" fn GetNameByTypeW(
22132122 lpServiceType: *GUID,
22142123 lpServiceName: [*:0]u16,
22152124 dwNameLength: u32,
22162125) callconv(.winapi) i32;
22172126
2218pub extern "ws2_32" fn getaddrinfo(
2219 pNodeName: ?[*:0]const u8,
2220 pServiceName: ?[*:0]const u8,
2221 pHints: ?*const addrinfoa,
2222 ppResult: *?*addrinfoa,
2223) callconv(.winapi) i32;
2224
2225pub extern "ws2_32" fn GetAddrInfoExA(
2226 pName: ?[*:0]const u8,
2227 pServiceName: ?[*:0]const u8,
2228 dwNameSapce: u32,
2127pub extern "ws2_32" fn GetAddrInfoExW(
2128 pName: ?[*:0]const u16,
2129 pServiceName: ?[*:0]const u16,
2130 dwNameSpace: DWORD,
22292131 lpNspId: ?*GUID,
2230 hints: ?*const addrinfoexA,
2231 ppResult: **addrinfoexA,
2132 hints: ?*const ADDRINFOEXW,
2133 ppResult: **ADDRINFOEXW,
22322134 timeout: ?*timeval,
22332135 lpOverlapped: ?*OVERLAPPED,
22342136 lpCompletionRoutine: ?LPLOOKUPSERVICE_COMPLETION_ROUTINE,
......@@ -2242,12 +2144,8 @@ pub extern "ws2_32" fn GetAddrInfoExOverlappedResult(
22422144 lpOverlapped: *OVERLAPPED,
22432145) callconv(.winapi) i32;
22442146
2245pub extern "ws2_32" fn freeaddrinfo(
2246 pAddrInfo: ?*addrinfoa,
2247) callconv(.winapi) void;
2248
2249pub extern "ws2_32" fn FreeAddrInfoEx(
2250 pAddrInfoEx: ?*addrinfoexA,
2147pub extern "ws2_32" fn FreeAddrInfoExW(
2148 pAddrInfoEx: ?*ADDRINFOEXW,
22512149) callconv(.winapi) void;
22522150
22532151pub extern "ws2_32" fn getnameinfo(