diff options
Diffstat (limited to 'src/File.zig')
| -rw-r--r-- | src/File.zig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/File.zig b/src/File.zig index f2723851..01c605bf 100644 --- a/src/File.zig +++ b/src/File.zig @@ -69,9 +69,9 @@ fn restoreName(p: *Pardes, pane: *Pane, f: *State, snap: Text.Place) void { if (slot == pane) break i; } else return; // nameBuffer frees nothing of `path`: it keeps the name it ends. - const back = p.gpa.dupe(u8, path) catch return; + const back = p.gpa.dupe(u8, path) catch |err| return p.reportError(id, "undo", err); defer p.gpa.free(back); - pardes.ctlfs.pane.nameBuffer(p, id, back, false) catch return; + pardes.ctlfs.pane.nameBuffer(p, id, back, false) catch |err| return p.reportError(id, "undo", err); history.gen = snap.gen; f.saved_hash = snap.saved_hash; f.saved_len = snap.saved_len; @@ -1512,9 +1512,9 @@ pub fn deleted(p: *Pardes, id: u8) void { if (f.disk_gone) return; f.disk_gone = true; var said: [limits.host_path_cap + 64]u8 = undefined; - p.setMessage(id, std.fmt.bufPrint(&said, "{s} deleted on disk (Save writes it again)", .{f.path}) catch "deleted on disk (Save writes it again)"); + p.setMessage(id, std.fmt.bufPrint(&said, "{s} deleted on disk (Save writes it again)", .{f.path[0..@min(f.path.len, limits.host_path_cap)]}) catch unreachable); var rec: [32]u8 = undefined; - pardes.ctlfs.events.notePath(p, "changed", std.fmt.bufPrint(&rec, "{d} deleted", .{pane.serial}) catch ""); + pardes.ctlfs.events.notePath(p, "changed", std.fmt.bufPrint(&rec, "{d} deleted", .{pane.serial}) catch unreachable); // a u32 } /// A file rewritten on disk. A clean buffer takes the new text, committed @@ -1539,16 +1539,16 @@ pub fn changed(p: *Pardes, id: u8, bytes: []const u8) void { f.disk_newer = disk; f.disk_newer_warned = false; var said: [limits.host_path_cap + 64]u8 = undefined; - p.setMessage(id, std.fmt.bufPrint(&said, "{s} changed on disk (get reloads it, Save overwrites it)", .{f.path}) catch "changed on disk (get reloads it, Save overwrites it)"); + p.setMessage(id, std.fmt.bufPrint(&said, "{s} changed on disk (get reloads it, Save overwrites it)", .{f.path[0..@min(f.path.len, limits.host_path_cap)]}) catch unreachable); var rec: [16]u8 = undefined; - pardes.ctlfs.events.notePath(p, "changed", std.fmt.bufPrint(&rec, "{d}", .{pane.serial}) catch ""); + pardes.ctlfs.events.notePath(p, "changed", std.fmt.bufPrint(&rec, "{d}", .{pane.serial}) catch unreachable); // a u32 return; }; f.disk_newer = null; // Logged as the dirty case is, with what became of it. var rec: [32]u8 = undefined; - pardes.ctlfs.events.notePath(p, "changed", std.fmt.bufPrint(&rec, "{d} reloaded", .{pane.serial}) catch ""); - const new = p.gpa.dupe(u8, bytes) catch return; + pardes.ctlfs.events.notePath(p, "changed", std.fmt.bufPrint(&rec, "{d} reloaded", .{pane.serial}) catch unreachable); // a u32 + const new = p.gpa.dupe(u8, bytes) catch |err| return p.reportError(id, "reload", err); pushUndo(p, pane); setContent(p, f, new); f.saved_revision = f.revision; |
