Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code: Remove allocator argument from Mapping.init

Browse Source
This commit is contained in:
Marten Ringwelski 2020-10-25 09:25:29 +01:00 committed by Isaac Freund
parent dd92b05af0
commit 16c8752de2
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
river/Mapping.zig
View File

@ -20,6 +20,7 @@ const Self = @This();
const std = @import("std"); const std = @import("std");
const c = @import("c.zig"); const c = @import("c.zig");
const util = @import("util.zig");
keysym: c.xkb_keysym_t, keysym: c.xkb_keysym_t,
modifiers: u32, modifiers: u32,
@ -29,17 +30,16 @@ command_args: []const []const u8,
release: bool, release: bool,
pub fn init( pub fn init(
allocator: *std.mem.Allocator,
keysym: c.xkb_keysym_t, keysym: c.xkb_keysym_t,
modifiers: u32, modifiers: u32,
release: bool, release: bool,
command_args: []const []const u8, command_args: []const []const u8,
) !Self { ) !Self {
const owned_args = try allocator.alloc([]u8, command_args.len); const owned_args = try util.gpa.alloc([]u8, command_args.len);
errdefer allocator.free(owned_args); errdefer util.gpa.free(owned_args);
for (command_args) |arg, i| { for (command_args) |arg, i| {
errdefer for (owned_args[0..i]) |a| allocator.free(a); errdefer for (owned_args[0..i]) |a| util.gpa.free(a);
owned_args[i] = try std.mem.dupe(allocator, u8, arg); owned_args[i] = try std.mem.dupe(util.gpa, u8, arg);
} }
return Self{ return Self{
.keysym = keysym, .keysym = keysym,
@ -49,7 +49,7 @@ pub fn init(
}; };
} }
pub fn deinit(self: Self, allocator: *std.mem.Allocator) void { pub fn deinit(self: Self) void {
for (self.command_args) |arg| allocator.free(arg); for (self.command_args) |arg| util.gpa.free(arg);
allocator.free(self.command_args); util.gpa.free(self.command_args);
} }

2
river/Mode.zig
View File

@ -35,7 +35,7 @@ pub fn init() Self {
} }
pub fn deinit(self: Self) void { pub fn deinit(self: Self) void {
for (self.mappings.items) |m| m.deinit(util.gpa); for (self.mappings.items) |m| m.deinit();
self.mappings.deinit(); self.mappings.deinit();
self.pointer_mappings.deinit(); self.pointer_mappings.deinit();
} }

2
river/command/map.zig
View File

@ -84,7 +84,7 @@ pub fn map(
} }
} }
try mode_mappings.append(try Mapping.init(util.gpa, keysym, modifiers, optionals.release, args[4 + offset ..])); try mode_mappings.append(try Mapping.init(keysym, modifiers, optionals.release, args[4 + offset ..]));
} }
/// Create a new pointer mapping for a given mode /// Create a new pointer mapping for a given mode