authorgravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2020-07-13 00:38:59+10:00
committergravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2020-07-13 00:38:59+10:00
log91235b937195910076a87cbb9ecbc6c5214ddd3b
treec05abc8bc964f01bd0d43cd1c3c37e774708678e
parentf7e4014c823f1134040beed700c2b0fff5384da1
signaturelock-open Commit is signed but in an unrecognized format.

std: don't store allocator inside of std.http.HeaderEntry

1 files changed, 16 insertions(+), 18 deletions(-)

lib/std/http/headers.zig+16-18
...@@ -27,7 +27,6 @@ fn never_index_default(name: []const u8) bool {...@@ -27,7 +27,6 @@ fn never_index_default(name: []const u8) bool {
27}27}
2828
29const HeaderEntry = struct {29const HeaderEntry = struct {
30 allocator: *Allocator,
31 name: []const u8,30 name: []const u8,
32 value: []u8,31 value: []u8,
33 never_index: bool,32 never_index: bool,
...@@ -36,23 +35,22 @@ const HeaderEntry = struct {...@@ -36,23 +35,22 @@ const HeaderEntry = struct {
3635
37 fn init(allocator: *Allocator, name: []const u8, value: []const u8, never_index: ?bool) !Self {36 fn init(allocator: *Allocator, name: []const u8, value: []const u8, never_index: ?bool) !Self {
38 return Self{37 return Self{
39 .allocator = allocator,
40 .name = name, // takes reference38 .name = name, // takes reference
41 .value = try allocator.dupe(u8, value),39 .value = try allocator.dupe(u8, value),
42 .never_index = never_index orelse never_index_default(name),40 .never_index = never_index orelse never_index_default(name),
43 };41 };
44 }42 }
4543
46 fn deinit(self: Self) void {44 fn deinit(self: Self, allocator: *Allocator) void {
47 self.allocator.free(self.value);45 allocator.free(self.value);
48 }46 }
4947
50 pub fn modify(self: *Self, value: []const u8, never_index: ?bool) !void {48 pub fn modify(self: *Self, allocator: *Allocator, value: []const u8, never_index: ?bool) !void {
51 const old_len = self.value.len;49 const old_len = self.value.len;
52 if (value.len > old_len) {50 if (value.len > old_len) {
53 self.value = try self.allocator.realloc(self.value, value.len);51 self.value = try allocator.realloc(self.value, value.len);
54 } else if (value.len < old_len) {52 } else if (value.len < old_len) {
55 self.value = self.allocator.shrink(self.value, value.len);53 self.value = allocator.shrink(self.value, value.len);
56 }54 }
57 mem.copy(u8, self.value, value);55 mem.copy(u8, self.value, value);
58 self.never_index = never_index orelse never_index_default(self.name);56 self.never_index = never_index orelse never_index_default(self.name);
...@@ -85,16 +83,16 @@ const HeaderEntry = struct {...@@ -85,16 +83,16 @@ const HeaderEntry = struct {
8583
86test "HeaderEntry" {84test "HeaderEntry" {
87 var e = try HeaderEntry.init(testing.allocator, "foo", "bar", null);85 var e = try HeaderEntry.init(testing.allocator, "foo", "bar", null);
88 defer e.deinit();86 defer e.deinit(testing.allocator);
89 testing.expectEqualSlices(u8, "foo", e.name);87 testing.expectEqualSlices(u8, "foo", e.name);
90 testing.expectEqualSlices(u8, "bar", e.value);88 testing.expectEqualSlices(u8, "bar", e.value);
91 testing.expectEqual(false, e.never_index);89 testing.expectEqual(false, e.never_index);
9290
93 try e.modify("longer value", null);91 try e.modify(testing.allocator, "longer value", null);
94 testing.expectEqualSlices(u8, "longer value", e.value);92 testing.expectEqualSlices(u8, "longer value", e.value);
9593
96 // shorter value94 // shorter value
97 try e.modify("x", null);95 try e.modify(testing.allocator, "x", null);
98 testing.expectEqualSlices(u8, "x", e.value);96 testing.expectEqualSlices(u8, "x", e.value);
99}97}
10098
...@@ -129,7 +127,7 @@ pub const Headers = struct {...@@ -129,7 +127,7 @@ pub const Headers = struct {
129 }127 }
130 {128 {
131 for (self.data.items) |entry| {129 for (self.data.items) |entry| {
132 entry.deinit();130 entry.deinit(self.allocator);
133 }131 }
134 self.data.deinit(self.allocator);132 self.data.deinit(self.allocator);
135 }133 }
...@@ -157,14 +155,14 @@ pub const Headers = struct {...@@ -157,14 +155,14 @@ pub const Headers = struct {
157 var entry: HeaderEntry = undefined;155 var entry: HeaderEntry = undefined;
158 if (self.index.getEntry(name)) |kv| {156 if (self.index.getEntry(name)) |kv| {
159 entry = try HeaderEntry.init(self.allocator, kv.key, value, never_index);157 entry = try HeaderEntry.init(self.allocator, kv.key, value, never_index);
160 errdefer entry.deinit();158 errdefer entry.deinit(self.allocator);
161 const dex = &kv.value;159 const dex = &kv.value;
162 try dex.append(self.allocator, n - 1);160 try dex.append(self.allocator, n - 1);
163 } else {161 } else {
164 const name_dup = try self.allocator.dupe(u8, name);162 const name_dup = try self.allocator.dupe(u8, name);
165 errdefer self.allocator.free(name_dup);163 errdefer self.allocator.free(name_dup);
166 entry = try HeaderEntry.init(self.allocator, name_dup, value, never_index);164 entry = try HeaderEntry.init(self.allocator, name_dup, value, never_index);
167 errdefer entry.deinit();165 errdefer entry.deinit(self.allocator);
168 var dex = HeaderIndexList{};166 var dex = HeaderIndexList{};
169 try dex.append(self.allocator, n - 1);167 try dex.append(self.allocator, n - 1);
170 errdefer dex.deinit(self.allocator);168 errdefer dex.deinit(self.allocator);
...@@ -203,7 +201,7 @@ pub const Headers = struct {...@@ -203,7 +201,7 @@ pub const Headers = struct {
203 const data_index = dex.items[i];201 const data_index = dex.items[i];
204 const removed = self.data.orderedRemove(data_index);202 const removed = self.data.orderedRemove(data_index);
205 assert(mem.eql(u8, removed.name, name));203 assert(mem.eql(u8, removed.name, name));
206 removed.deinit();204 removed.deinit(self.allocator);
207 }205 }
208 dex.deinit(self.allocator);206 dex.deinit(self.allocator);
209 self.allocator.free(kv.key);207 self.allocator.free(kv.key);
...@@ -226,13 +224,13 @@ pub const Headers = struct {...@@ -226,13 +224,13 @@ pub const Headers = struct {
226 if (dex.items.len == 1) {224 if (dex.items.len == 1) {
227 // was last item; delete the index225 // was last item; delete the index
228 dex.deinit(self.allocator);226 dex.deinit(self.allocator);
229 removed.deinit();227 removed.deinit(self.allocator);
230 const key = kv.key;228 const key = kv.key;
231 _ = self.index.remove(key); // invalidates `kv` and `dex`229 _ = self.index.remove(key); // invalidates `kv` and `dex`
232 self.allocator.free(key);230 self.allocator.free(key);
233 } else {231 } else {
234 dex.shrink(self.allocator, dex.items.len - 1);232 dex.shrink(self.allocator, dex.items.len - 1);
235 removed.deinit();233 removed.deinit(self.allocator);
236 }234 }
237 // if it was the last item; no need to rebuild index235 // if it was the last item; no need to rebuild index
238 if (i != self.data.items.len) {236 if (i != self.data.items.len) {
...@@ -251,13 +249,13 @@ pub const Headers = struct {...@@ -251,13 +249,13 @@ pub const Headers = struct {
251 if (dex.items.len == 1) {249 if (dex.items.len == 1) {
252 // was last item; delete the index250 // was last item; delete the index
253 dex.deinit(self.allocator);251 dex.deinit(self.allocator);
254 removed.deinit();252 removed.deinit(self.allocator);
255 const key = kv.key;253 const key = kv.key;
256 _ = self.index.remove(key); // invalidates `kv` and `dex`254 _ = self.index.remove(key); // invalidates `kv` and `dex`
257 self.allocator.free(key);255 self.allocator.free(key);
258 } else {256 } else {
259 dex.shrink(self.allocator, dex.items.len - 1);257 dex.shrink(self.allocator, dex.items.len - 1);
260 removed.deinit();258 removed.deinit(self.allocator);
261 }259 }
262 // if it was the last item; no need to rebuild index260 // if it was the last item; no need to rebuild index
263 if (i != self.data.items.len) {261 if (i != self.data.items.len) {