mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.os.uefi: fix GUID formatting (#11452)

Browse Source
This commit is contained in:
Yusuf Bham 2022-04-17 06:15:15 -04:00 committed by GitHub
parent 7b090df668
commit 2aeaa1cfc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/std/os/uefi.zig
View File

@ -53,13 +53,19 @@ pub const Guid = extern struct {
) !void {
_ = options;
if (f.len == 0) {
return std.fmt.format(writer, "{x:0>8}-{x:0>4}-{x:0>4}-{x:0>2}{x:0>2}-{x:0>12}", .{
self.time_low,
self.time_mid,
self.time_high_and_version,
self.clock_seq_high_and_reserved,
self.clock_seq_low,
self.node,
const fmt = std.fmt.fmtSliceHexLower;
const time_low = @byteSwap(u32, self.time_low);
const time_mid = @byteSwap(u16, self.time_mid);
const time_high_and_version = @byteSwap(u16, self.time_high_and_version);
return std.fmt.format(writer, "{:0>8}-{:0>4}-{:0>4}-{:0>2}{:0>2}-{:0>12}", .{
fmt(std.mem.asBytes(&time_low)),
fmt(std.mem.asBytes(&time_mid)),
fmt(std.mem.asBytes(&time_high_and_version)),
fmt(std.mem.asBytes(&self.clock_seq_high_and_reserved)),
fmt(std.mem.asBytes(&self.clock_seq_low)),
fmt(std.mem.asBytes(&self.node)),
});
} else {
@compileError("Unknown format character: '" ++ f ++ "'");
@ -133,3 +139,14 @@ pub const TimeCapabilities = extern struct {
/// File Handle as specified in the EFI Shell Spec
pub const FileHandle = *opaque {};
test "GUID formatting" {
var bytes = [_]u8{ 137, 60, 203, 50, 128, 128, 124, 66, 186, 19, 80, 73, 135, 59, 194, 135 };
var guid = @bitCast(Guid, bytes);
var str = try std.fmt.allocPrint(std.testing.allocator, "{}", .{guid});
defer std.testing.allocator.free(str);
try std.testing.expect(std.mem.eql(u8, str, "32cb3c89-8080-427c-ba13-5049873bc287"));
}