| ... | @@ -157,7 +157,7 @@ pub fn main() !void { | ... | @@ -157,7 +157,7 @@ pub fn main() !void { |
| 157 | | 157 | |
| 158 | for (lib_names) |lib_name, lib_name_index| { | 158 | for (lib_names) |lib_name, lib_name_index| { |
| 159 | const lib_prefix = if (std.mem.eql(u8, lib_name, "ld")) "" else "lib"; | 159 | const lib_prefix = if (std.mem.eql(u8, lib_name, "ld")) "" else "lib"; |
| 160 | const basename = try fmt.allocPrint(allocator, "{}{}.abilist", .{ lib_prefix, lib_name }); | 160 | const basename = try fmt.allocPrint(allocator, "{s}{s}.abilist", .{ lib_prefix, lib_name }); |
| 161 | const abi_list_filename = blk: { | 161 | const abi_list_filename = blk: { |
| 162 | const is_c = std.mem.eql(u8, lib_name, "c"); | 162 | const is_c = std.mem.eql(u8, lib_name, "c"); |
| 163 | const is_m = std.mem.eql(u8, lib_name, "m"); | 163 | const is_m = std.mem.eql(u8, lib_name, "m"); |
| ... | @@ -185,7 +185,7 @@ pub fn main() !void { | ... | @@ -185,7 +185,7 @@ pub fn main() !void { |
| 185 | }; | 185 | }; |
| 186 | const max_bytes = 10 * 1024 * 1024; | 186 | const max_bytes = 10 * 1024 * 1024; |
| 187 | const contents = std.fs.cwd().readFileAlloc(allocator, abi_list_filename, max_bytes) catch |err| { | 187 | const contents = std.fs.cwd().readFileAlloc(allocator, abi_list_filename, max_bytes) catch |err| { |
| 188 | std.debug.warn("unable to open {}: {}\n", .{ abi_list_filename, err }); | 188 | std.debug.warn("unable to open {s}: {s}\n", .{ abi_list_filename, err }); |
| 189 | std.process.exit(1); | 189 | std.process.exit(1); |
| 190 | }; | 190 | }; |
| 191 | var lines_it = std.mem.tokenize(contents, "\n"); | 191 | var lines_it = std.mem.tokenize(contents, "\n"); |
| ... | @@ -243,7 +243,7 @@ pub fn main() !void { | ... | @@ -243,7 +243,7 @@ pub fn main() !void { |
| 243 | const vers_txt = buffered.writer(); | 243 | const vers_txt = buffered.writer(); |
| 244 | for (global_ver_list) |name, i| { | 244 | for (global_ver_list) |name, i| { |
| 245 | _ = global_ver_set.put(name, i) catch unreachable; | 245 | _ = global_ver_set.put(name, i) catch unreachable; |
| 246 | try vers_txt.print("{}\n", .{name}); | 246 | try vers_txt.print("{s}\n", .{name}); |
| 247 | } | 247 | } |
| 248 | try buffered.flush(); | 248 | try buffered.flush(); |
| 249 | } | 249 | } |
| ... | @@ -256,7 +256,7 @@ pub fn main() !void { | ... | @@ -256,7 +256,7 @@ pub fn main() !void { |
| 256 | for (global_fn_list) |name, i| { | 256 | for (global_fn_list) |name, i| { |
| 257 | const entry = global_fn_set.getEntry(name).?; | 257 | const entry = global_fn_set.getEntry(name).?; |
| 258 | entry.value.index = i; | 258 | entry.value.index = i; |
| 259 | try fns_txt.print("{} {}\n", .{ name, entry.value.lib }); | 259 | try fns_txt.print("{s} {s}\n", .{ name, entry.value.lib }); |
| 260 | } | 260 | } |
| 261 | try buffered.flush(); | 261 | try buffered.flush(); |
| 262 | } | 262 | } |
| ... | @@ -290,7 +290,7 @@ pub fn main() !void { | ... | @@ -290,7 +290,7 @@ pub fn main() !void { |
| 290 | const fn_vers_list = &target_functions.getEntry(@ptrToInt(abi_list)).?.value.fn_vers_list; | 290 | const fn_vers_list = &target_functions.getEntry(@ptrToInt(abi_list)).?.value.fn_vers_list; |
| 291 | for (abi_list.targets) |target, it_i| { | 291 | for (abi_list.targets) |target, it_i| { |
| 292 | if (it_i != 0) try abilist_txt.writeByte(' '); | 292 | if (it_i != 0) try abilist_txt.writeByte(' '); |
| 293 | try abilist_txt.print("{}-linux-{}", .{ @tagName(target.arch), @tagName(target.abi) }); | 293 | try abilist_txt.print("{s}-linux-{s}", .{ @tagName(target.arch), @tagName(target.abi) }); |
| 294 | } | 294 | } |
| 295 | try abilist_txt.writeByte('\n'); | 295 | try abilist_txt.writeByte('\n'); |
| 296 | // next, each line implicitly corresponds to a function | 296 | // next, each line implicitly corresponds to a function |
Michael Dusan <michael.dusan@gmail.com> 2021-02-01 16:57:41-05:00