Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary contents field from File 

It was causing a segfault on `mipsel` architecture, not sure why other
architectures weren't affected.
master
LeRoyce Pearson 2020-04-07 23:57:59 -06:00 committed by Andrew Kelley
parent c88ece3679
commit 204aa7dc1a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/std/cache_hash.zig
View File

@ -18,17 +18,12 @@ pub const File = struct {
path: ?[]const u8,
stat: fs.File.Stat,
bin_digest: [BIN_DIGEST_LEN]u8,
contents: ?[]const u8,
pub fn deinit(self: *@This(), alloc: *Allocator) void {
if (self.path) |owned_slice| {
alloc.free(owned_slice);
self.path = null;
}
if (self.contents) |owned_slice| {
alloc.free(owned_slice);
self.contents = null;
}
}
};
@ -232,7 +227,7 @@ pub const CacheHash = struct {
if (idx < input_file_count or idx == 0) {
self.manifest_dirty = true;
while (idx < input_file_count) : (idx += 1) {
var cache_hash_file = self.files.ptrAt(idx);
var cache_hash_file = &self.files.items[idx];
self.populate_file_hash(cache_hash_file) catch |err| {
self.manifest_file.?.close();
self.manifest_file = null;
@ -318,7 +313,7 @@ fn hash_file(alloc: *Allocator, bin_digest: []u8, handle: *const fs.File) !void
blake3.final(bin_digest);
}
test "cache file and the recall it" {
test "cache file and then recall it" {
const cwd = fs.cwd();
const temp_file = "test.txt";