Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 08:46:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: ensure formatting can only return OOM

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-12-15 18:18:59 -08:00
parent abf713feec
commit e4b6b89951
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/config/Config.zig
View File

@ -3617,7 +3617,7 @@ pub const Color = struct {
} }
/// Format the color as a string. /// Format the color as a string.
pub fn formatBuf(self: Color, buf: []u8) ![]const u8 { pub fn formatBuf(self: Color, buf: []u8) Allocator.Error![]const u8 {
return std.fmt.bufPrint( return std.fmt.bufPrint(
buf, buf,
"#{x:0>2}{x:0>2}{x:0>2}", "#{x:0>2}{x:0>2}{x:0>2}",
@ -3745,7 +3745,10 @@ pub const ColorList = struct {
} }
/// Used by Formatter /// Used by Formatter
pub fn formatEntry(self: Self, formatter: anytype) !void { pub fn formatEntry(
self: Self,
formatter: anytype,
) !void {
// If no items, we want to render an empty field. // If no items, we want to render an empty field.
if (self.colors.items.len == 0) { if (self.colors.items.len == 0) {
try formatter.formatEntry(void, {}); try formatter.formatEntry(void, {});
@ -3760,8 +3763,8 @@ pub const ColorList = struct {
for (self.colors.items, 0..) |color, i| { for (self.colors.items, 0..) |color, i| {
var color_buf: [128]u8 = undefined; var color_buf: [128]u8 = undefined;
const color_str = try color.formatBuf(&color_buf); const color_str = try color.formatBuf(&color_buf);
if (i != 0) try writer.writeByte(','); if (i != 0) writer.writeByte(',') catch return error.OutOfMemory;
try writer.writeAll(color_str); writer.writeAll(color_str) catch return error.OutOfMemory;
} }
try formatter.formatEntry( try formatter.formatEntry(