RomanNum3ral
/
ly
mirror of https://github.com/fairyglade/ly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't dynamically allocate color strings 

Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion 2025-03-06 13:23:47 +01:00
parent 3e6d7a1b3b
commit 973d8fe120
No known key found for this signature in database
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/config/migrator.zig
View File

@ -37,7 +37,7 @@ pub var maybe_save_file: ?[]const u8 = null;
pub var mapped_config_fields = false; pub var mapped_config_fields = false;
pub fn configFieldHandler(allocator: std.mem.Allocator, field: ini.IniField) ?ini.IniField { pub fn configFieldHandler(_: std.mem.Allocator, field: ini.IniField) ?ini.IniField {
if (std.mem.eql(u8, field.key, "animate")) { if (std.mem.eql(u8, field.key, "animate")) {
// The option doesn't exist anymore, but we save its value for "animation" // The option doesn't exist anymore, but we save its value for "animation"
maybe_animate = std.mem.eql(u8, field.value, "true"); maybe_animate = std.mem.eql(u8, field.value, "true");
@ -68,7 +68,7 @@ pub fn configFieldHandler(allocator: std.mem.Allocator, field: ini.IniField) ?in
const color = std.fmt.parseInt(u16, field.value, 0) catch return field; const color = std.fmt.parseInt(u16, field.value, 0) catch return field;
var mapped_field = field; var mapped_field = field;
mapped_field.value = mapColor(allocator, color) catch return field; mapped_field.value = mapColor(color) catch return field;
mapped_config_fields = true; mapped_config_fields = true;
return mapped_field; return mapped_field;
} }
@ -173,7 +173,7 @@ pub fn tryMigrateSaveFile(user_buf: *[32]u8) Save {
return save; return save;
} }
fn mapColor(allocator: std.mem.Allocator, color: u16) ![]const u8 { fn mapColor(color: u16) ![]const u8 {
const color_no_styling = color & 0x00FF; const color_no_styling = color & 0x00FF;
const styling_only = color & 0xFF00; const styling_only = color & 0xFF00;
@ -195,5 +195,6 @@ fn mapColor(allocator: std.mem.Allocator, color: u16) ![]const u8 {
new_color |= @as(u32, @intCast(styling_only)) << 16; new_color |= @as(u32, @intCast(styling_only)) << 16;
} }
return try std.fmt.allocPrint(allocator, "0x{X}", .{new_color}); var buffer = std.mem.zeroes([10]u8);
return try std.fmt.bufPrint(&buffer, "0x{X}", .{new_color});
} }