diff options
| author | r00ster91 <r00ster91@proton.me> | 2022-07-23 16:53:59 +0200 |
|---|---|---|
| committer | Veikka Tuominen <git@vexu.eu> | 2022-07-27 18:07:53 +0300 |
| commit | baafb8a491c296fbf434c8cf44d9485e8f2c729c (patch) | |
| tree | 4dffed76fe1898abb975c70085e509b7f0e3a879 /src/link | |
| parent | 4ef7d8581085394d55f5effbb38c05a15546af1b (diff) | |
| download | zig-baafb8a491c296fbf434c8cf44d9485e8f2c729c.tar.gz zig-baafb8a491c296fbf434c8cf44d9485e8f2c729c.zip | |
std.fmt: add more invalid format string errors
Diffstat (limited to 'src/link')
| -rw-r--r-- | src/link/MachO/Atom.zig | 6 | ||||
| -rw-r--r-- | src/link/MachO/Dylib.zig | 4 | ||||
| -rw-r--r-- | src/link/MachO/Object.zig | 4 | ||||
| -rw-r--r-- | src/link/MachO/fat.zig | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/link/MachO/Atom.zig b/src/link/MachO/Atom.zig index ca840e1a51..ba00764127 100644 --- a/src/link/MachO/Atom.zig +++ b/src/link/MachO/Atom.zig @@ -246,7 +246,7 @@ pub fn parseRelocs(self: *Atom, relocs: []const macho.relocation_info, context: else => { log.err("unexpected relocation type after ARM64_RELOC_ADDEND", .{}); log.err(" expected ARM64_RELOC_PAGE21 or ARM64_RELOC_PAGEOFF12", .{}); - log.err(" found {s}", .{next}); + log.err(" found {}", .{next}); return error.UnexpectedRelocationType; }, } @@ -285,7 +285,7 @@ pub fn parseRelocs(self: *Atom, relocs: []const macho.relocation_info, context: else => { log.err("unexpected relocation type after ARM64_RELOC_ADDEND", .{}); log.err(" expected ARM64_RELOC_UNSIGNED", .{}); - log.err(" found {s}", .{@intToEnum(macho.reloc_type_arm64, relocs[i + 1].r_type)}); + log.err(" found {}", .{@intToEnum(macho.reloc_type_arm64, relocs[i + 1].r_type)}); return error.UnexpectedRelocationType; }, }, @@ -294,7 +294,7 @@ pub fn parseRelocs(self: *Atom, relocs: []const macho.relocation_info, context: else => { log.err("unexpected relocation type after X86_64_RELOC_ADDEND", .{}); log.err(" expected X86_64_RELOC_UNSIGNED", .{}); - log.err(" found {s}", .{@intToEnum(macho.reloc_type_x86_64, relocs[i + 1].r_type)}); + log.err(" found {}", .{@intToEnum(macho.reloc_type_x86_64, relocs[i + 1].r_type)}); return error.UnexpectedRelocationType; }, }, diff --git a/src/link/MachO/Dylib.zig b/src/link/MachO/Dylib.zig index e46ede8d1e..ffc0b2cca6 100644 --- a/src/link/MachO/Dylib.zig +++ b/src/link/MachO/Dylib.zig @@ -167,7 +167,7 @@ pub fn parse( const this_arch: std.Target.Cpu.Arch = try fat.decodeArch(self.header.?.cputype, true); if (this_arch != cpu_arch) { - log.err("mismatched cpu architecture: expected {s}, found {s}", .{ cpu_arch, this_arch }); + log.err("mismatched cpu architecture: expected {}, found {}", .{ cpu_arch, this_arch }); return error.MismatchedCpuArchitecture; } @@ -208,7 +208,7 @@ fn readLoadCommands( } }, else => { - log.debug("Unknown load command detected: 0x{x}.", .{cmd.cmd()}); + log.debug("Unknown load command detected: 0x{x}.", .{@enumToInt(cmd.cmd())}); }, } self.load_commands.appendAssumeCapacity(cmd); diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig index c7fb4f3ee4..0d929627cd 100644 --- a/src/link/MachO/Object.zig +++ b/src/link/MachO/Object.zig @@ -110,7 +110,7 @@ pub fn parse(self: *Object, allocator: Allocator, cpu_arch: std.Target.Cpu.Arch) }, }; if (this_arch != cpu_arch) { - log.err("mismatched cpu architecture: expected {s}, found {s}", .{ cpu_arch, this_arch }); + log.err("mismatched cpu architecture: expected {}, found {}", .{ cpu_arch, this_arch }); return error.MismatchedCpuArchitecture; } @@ -171,7 +171,7 @@ pub fn parse(self: *Object, allocator: Allocator, cpu_arch: std.Target.Cpu.Arch) cmd.linkedit_data.dataoff += file_offset; }, else => { - log.debug("Unknown load command detected: 0x{x}.", .{cmd.cmd()}); + log.debug("Unknown load command detected: 0x{x}.", .{@enumToInt(cmd.cmd())}); }, } self.load_commands.appendAssumeCapacity(cmd); diff --git a/src/link/MachO/fat.zig b/src/link/MachO/fat.zig index 3eddd93761..1511f274a8 100644 --- a/src/link/MachO/fat.zig +++ b/src/link/MachO/fat.zig @@ -46,7 +46,7 @@ pub fn getLibraryOffset(reader: anytype, cpu_arch: std.Target.Cpu.Arch) !u64 { return fat_arch.offset; } } else { - log.err("Could not find matching cpu architecture in fat library: expected {s}", .{cpu_arch}); + log.err("Could not find matching cpu architecture in fat library: expected {}", .{cpu_arch}); return error.MismatchedCpuArchitecture; } } |