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

fixups

Browse Source 
* getrandom libc prototypes had the wrong return type
 * `total_read` local variable was unnecessary since the sub-slice
   buffer has a length
 * I was able to get rid of all the integer casts
 * the err == 0 check can be a switch case
 * add missing `return` statement
This commit is contained in:
Andrew Kelley 2019-08-20 15:25:30 -04:00
parent 79354243e3
commit 9bf283c085
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
3 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
std/c/freebsd.zig
View File

@ -6,4 +6,4 @@ pub const _errno = __error;
pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize; pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int; pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) c_int; pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;

2
std/c/linux.zig
View File

@ -7,7 +7,7 @@ pub const _errno = __errno_location;
pub const MAP_FAILED = @intToPtr(*c_void, maxInt(usize)); pub const MAP_FAILED = @intToPtr(*c_void, maxInt(usize));
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) c_int; pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;
pub extern "c" fn sched_getaffinity(pid: c_int, size: usize, set: *cpu_set_t) c_int; pub extern "c" fn sched_getaffinity(pid: c_int, size: usize, set: *cpu_set_t) c_int;
pub extern "c" fn eventfd(initval: c_uint, flags: c_uint) c_int; pub extern "c" fn eventfd(initval: c_uint, flags: c_uint) c_int;
pub extern "c" fn epoll_ctl(epfd: fd_t, op: c_uint, fd: fd_t, event: ?*epoll_event) c_int; pub extern "c" fn epoll_ctl(epfd: fd_t, op: c_uint, fd: fd_t, event: ?*epoll_event) c_int;

57
std/os.zig
View File

@ -99,55 +99,46 @@ pub const GetRandomError = OpenError;
/// When linking against libc, this calls the /// When linking against libc, this calls the
/// appropriate OS-specific library call. Otherwise it uses the zig standard /// appropriate OS-specific library call. Otherwise it uses the zig standard
/// library implementation. /// library implementation.
pub fn getrandom(buf: []u8) GetRandomError!void { pub fn getrandom(buffer: []u8) GetRandomError!void {
if (windows.is_the_target) { if (windows.is_the_target) {
return windows.RtlGenRandom(buf); return windows.RtlGenRandom(buffer);
} }
if (linux.is_the_target or freebsd.is_the_target) { if (linux.is_the_target or freebsd.is_the_target) {
var buf_slice: []u8 = buf[0..]; var buf = buffer;
var total_read: usize = 0; const use_c = !linux.is_the_target or
const use_c = (!linux.is_the_target) or std.c.versionCheck(builtin.Version{ .major = 2, .minor = 25, .patch = 0 }).ok; std.c.versionCheck(builtin.Version{ .major = 2, .minor = 25, .patch = 0 }).ok;
while (total_read < buf.len) { while (buf.len != 0) {
var err: u16 = 0; var err: u16 = undefined;
const num_read: usize = if (use_c) blk: { const num_read = if (use_c) blk: {
const res: c_int = std.c.getrandom(buf_slice.ptr, buf_slice.len, 0); const rc = std.c.getrandom(buf.ptr, buf.len, 0);
err = std.c.getErrno(rc);
if (res == -1) { break :blk @bitCast(usize, rc);
err = @intCast(u16, std.c._errno().*);
break :blk 0;
} else {
break :blk @intCast(usize, res);
}
} else blk: { } else blk: {
const res: usize = linux.getrandom(buf_slice.ptr, buf_slice.len, 0); const rc = linux.getrandom(buf.ptr, buf.len, 0);
err = linux.getErrno(rc);
err = @intCast(u16, linux.getErrno(res)); break :blk rc;
break :blk res;
}; };
if (err != 0) { switch (err) {
switch (err) { 0 => buf = buf[num_read..],
EINVAL => unreachable, EINVAL => unreachable,
EFAULT => unreachable, EFAULT => unreachable,
EINTR => continue, EINTR => continue,
ENOSYS => return getRandomBytesDevURandom(buf), ENOSYS => return getRandomBytesDevURandom(buf),
else => return unexpectedErrno(err), else => return unexpectedErrno(err),
}
} else {
total_read += num_read;
buf_slice = buf_slice[num_read..];
} }
} }
return;
} }
if (wasi.is_the_target) { if (wasi.is_the_target) {
switch (wasi.random_get(buf.ptr, buf.len)) { switch (wasi.random_get(buffer.ptr, buffer.len)) {
0 => return, 0 => return,
else => |err| return unexpectedErrno(err), else => |err| return unexpectedErrno(err),
} }
} }
return getRandomBytesDevURandom(buf); return getRandomBytesDevURandom(buffer);
} }
fn getRandomBytesDevURandom(buf: []u8) !void { fn getRandomBytesDevURandom(buf: []u8) !void {