mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-22 14:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

os: have sendmsg, recvmsg flags be c_int

Browse Source
This commit is contained in:
lithdew 2021-05-14 15:50:09 +09:00 committed by Kenta Iwasaki
parent 12650bcda4
commit 9ba65592d6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/c.zig
View File

@ -166,7 +166,7 @@ pub extern "c" fn sendto(
dest_addr: ?*const sockaddr, dest_addr: ?*const sockaddr,
addrlen: socklen_t, addrlen: socklen_t,
) isize; ) isize;
pub extern "c" fn sendmsg(sockfd: fd_t, msg: *const std.x.os.Socket.Message, flags: u32) isize; pub extern "c" fn sendmsg(sockfd: fd_t, msg: *const std.x.os.Socket.Message, flags: c_int) isize;
pub extern "c" fn recv(sockfd: fd_t, arg1: ?*c_void, arg2: usize, arg3: c_int) isize; pub extern "c" fn recv(sockfd: fd_t, arg1: ?*c_void, arg2: usize, arg3: c_int) isize;
pub extern "c" fn recvfrom( pub extern "c" fn recvfrom(
@ -177,7 +177,7 @@ pub extern "c" fn recvfrom(
noalias src_addr: ?*sockaddr, noalias src_addr: ?*sockaddr,
noalias addrlen: ?*socklen_t, noalias addrlen: ?*socklen_t,
) isize; ) isize;
pub extern "c" fn recvmsg(sockfd: fd_t, msg: *std.x.os.Socket.Message, flags: u32) isize; pub extern "c" fn recvmsg(sockfd: fd_t, msg: *std.x.os.Socket.Message, flags: c_int) isize;
pub usingnamespace switch (builtin.os.tag) { pub usingnamespace switch (builtin.os.tag) {
.netbsd => struct { .netbsd => struct {

2
lib/std/os.zig
View File

@ -4998,7 +4998,7 @@ pub fn sendmsg(
flags: u32, flags: u32,
) SendMsgError!usize { ) SendMsgError!usize {
while (true) { while (true) {
const rc = system.sendmsg(sockfd, &msg, flags); const rc = system.sendmsg(sockfd, &msg, @intCast(c_int, flags));
if (builtin.os.tag == .windows) { if (builtin.os.tag == .windows) {
if (rc == windows.ws2_32.SOCKET_ERROR) { if (rc == windows.ws2_32.SOCKET_ERROR) {
switch (windows.ws2_32.WSAGetLastError()) { switch (windows.ws2_32.WSAGetLastError()) {

4
lib/std/os/linux.zig
View File

@ -1004,7 +1004,7 @@ pub fn sendmsg(fd: i32, msg: *const msghdr_const, flags: u32) usize {
if (native_arch == .i386) { if (native_arch == .i386) {
return socketcall(SC_sendmsg, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags }); return socketcall(SC_sendmsg, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags });
} }
return syscall3(.sendmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags); return syscall3(.sendmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), @bitCast(usize, @as(isize, flags)));
} }
pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize { pub fn sendmmsg(fd: i32, msgvec: [*]mmsghdr_const, vlen: u32, flags: u32) usize {
@ -1058,7 +1058,7 @@ pub fn recvmsg(fd: i32, msg: *msghdr, flags: u32) usize {
if (native_arch == .i386) { if (native_arch == .i386) {
return socketcall(SC_recvmsg, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags }); return socketcall(SC_recvmsg, &[3]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags });
} }
return syscall3(.recvmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), flags); return syscall3(.recvmsg, @bitCast(usize, @as(isize, fd)), @ptrToInt(msg), @bitCast(usize, @as(isize, flags)));
} }
pub fn recvfrom(fd: i32, noalias buf: [*]u8, len: usize, flags: u32, noalias addr: ?*sockaddr, noalias alen: ?*socklen_t) usize { pub fn recvfrom(fd: i32, noalias buf: [*]u8, len: usize, flags: u32, noalias addr: ?*sockaddr, noalias alen: ?*socklen_t) usize {

2
lib/std/x/os/socket_posix.zig
View File

@ -87,7 +87,7 @@ pub fn Mixin(comptime Socket: type) type {
/// read into the buffer provided. /// read into the buffer provided.
pub fn readVectorized(self: Socket, msg: *Socket.Message, flags: u32) !usize { pub fn readVectorized(self: Socket, msg: *Socket.Message, flags: u32) !usize {
while (true) { while (true) {
const rc = os.system.recvmsg(self.fd, msg, flags); const rc = os.system.recvmsg(self.fd, msg, @intCast(c_int, flags));
return switch (os.errno(rc)) { return switch (os.errno(rc)) {
0 => @intCast(usize, rc), 0 => @intCast(usize, rc),
os.EBADF => unreachable, // always a race condition os.EBADF => unreachable, // always a race condition