authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2021-02-01 16:57:41-05:00
committergravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2021-02-01 16:57:41-05:00
log70a7c14ca6576cfc8b8dfa540ec5fe1a1167200f
treea179ace44161c29412dd0f6597d463597db8719a
parent102d9542203e52839156cb61efdfca8403a379a9
signature Commit is signed but in an unrecognized format.

update update_glibc to format strings with "{s}"


1 files changed, 5 insertions(+), 5 deletions(-)

tools/update_glibc.zig+5-5
......@@ -157,7 +157,7 @@ pub fn main() !void {
157157
158158 for (lib_names) |lib_name, lib_name_index| {
159159 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 });
161161 const abi_list_filename = blk: {
162162 const is_c = std.mem.eql(u8, lib_name, "c");
163163 const is_m = std.mem.eql(u8, lib_name, "m");
......@@ -185,7 +185,7 @@ pub fn main() !void {
185185 };
186186 const max_bytes = 10 * 1024 * 1024;
187187 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 });
189189 std.process.exit(1);
190190 };
191191 var lines_it = std.mem.tokenize(contents, "\n");
......@@ -243,7 +243,7 @@ pub fn main() !void {
243243 const vers_txt = buffered.writer();
244244 for (global_ver_list) |name, i| {
245245 _ = global_ver_set.put(name, i) catch unreachable;
246 try vers_txt.print("{}\n", .{name});
246 try vers_txt.print("{s}\n", .{name});
247247 }
248248 try buffered.flush();
249249 }
......@@ -256,7 +256,7 @@ pub fn main() !void {
256256 for (global_fn_list) |name, i| {
257257 const entry = global_fn_set.getEntry(name).?;
258258 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 });
260260 }
261261 try buffered.flush();
262262 }
......@@ -290,7 +290,7 @@ pub fn main() !void {
290290 const fn_vers_list = &target_functions.getEntry(@ptrToInt(abi_list)).?.value.fn_vers_list;
291291 for (abi_list.targets) |target, it_i| {
292292 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) });
294294 }
295295 try abilist_txt.writeByte('\n');
296296 // next, each line implicitly corresponds to a function