lobo/ssd1306_oled_display_cli
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

remove allocation of Options on the heap

Browse Source
This commit is contained in:
Emil Lerch 2023-04-08 17:26:05 -07:00
parent 25e410c0b5
commit 50dc69ae9b
Signed by: lobo
GPG Key ID: A7B62D657EF764F8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.zig
View File

@ -83,8 +83,7 @@ pub fn main() !void {
line_inx += 1; line_inx += 1;
} }
} }
const opts = try processArgs(alloc, args, &lines); const opts = try processArgs(args, &lines);
defer alloc.destroy(opts);
if (opts.background_filename.len > 0) try stdout.print("Converting {s}\n", .{opts.background_filename}); if (opts.background_filename.len > 0) try stdout.print("Converting {s}\n", .{opts.background_filename});
var pixels: [display.WIDTH * display.HEIGHT]u8 = undefined; var pixels: [display.WIDTH * display.HEIGHT]u8 = undefined;
try convertImage(opts.background_filename, &pixels, noTextForLine); try convertImage(opts.background_filename, &pixels, noTextForLine);
@ -114,14 +113,16 @@ fn deinit() void {
font_arena = null; font_arena = null;
} }
fn processArgs(allocator: std.mem.Allocator, args: [][:0]u8, line_array: *[display.LINES]*const [:0]u8) !*Options { fn processArgs(args: [][:0]u8, line_array: *[display.LINES]*const [:0]u8) !Options {
if (args.len < 2) try usage(args); if (args.len < 2) try usage(args);
const prefix = "/dev/ttyUSB"; const prefix = "/dev/ttyUSB";
var opts = try allocator.create(Options); var opts = Options{
opts.device_file = args[1]; .device_file = args[1],
.flip = false,
.background_filename = @constCast(""),
};
if (!std.mem.eql(u8, opts.device_file, "-") and !std.mem.startsWith(u8, opts.device_file, prefix)) try usage(args); if (!std.mem.eql(u8, opts.device_file, "-") and !std.mem.startsWith(u8, opts.device_file, prefix)) try usage(args);
opts.background_filename = @constCast("");
var is_filename = false; var is_filename = false;
var line_number: ?usize = null; var line_number: ?usize = null;
for (args[1..], 1..) |arg, i| { for (args[1..], 1..) |arg, i| {