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

cli args without arena

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-11-13 11:21:12 -08:00
parent 3e92ec5ccd
commit 445ca8998f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cli_args.zig
View File

@ -28,8 +28,9 @@ pub fn parse(comptime T: type, alloc: Allocator, dst: *T, iter: anytype) !void {
// Make an arena for all our allocations if we support it. Otherwise, // Make an arena for all our allocations if we support it. Otherwise,
// use an allocator that always fails. If the arena is already set on // use an allocator that always fails. If the arena is already set on
// the config, then we reuse that. See memory note in parse docs. // the config, then we reuse that. See memory note in parse docs.
const arena_available = @hasField(T, "_arena");
var arena_owned: bool = false; var arena_owned: bool = false;
const arena_alloc = if (@hasField(T, "_arena")) arena: { const arena_alloc = if (arena_available) arena: {
// If the arena is unset, we create it. We mark that we own it // If the arena is unset, we create it. We mark that we own it
// only so that we can clean it up on error. // only so that we can clean it up on error.
if (dst._arena == null) { if (dst._arena == null) {
@ -38,8 +39,12 @@ pub fn parse(comptime T: type, alloc: Allocator, dst: *T, iter: anytype) !void {
} }
break :arena dst._arena.?.allocator(); break :arena dst._arena.?.allocator();
} else std.mem.fail_allocator; } else fail: {
errdefer if (arena_owned) { // Note: this is... not safe...
var fail = std.testing.FailingAllocator.init(alloc, 0);
break :fail fail.allocator();
};
errdefer if (arena_available and arena_owned) {
dst._arena.?.deinit(); dst._arena.?.deinit();
dst._arena = null; dst._arena = null;
}; };