Skip to content

Commit 7f4f604

Browse files
committed
Fix more compilation errors for GCC 4.2.1
1 parent 60d2b92 commit 7f4f604

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

src/bench.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -210,18 +210,17 @@ int main(int argc, char *argv[])
210210
if (!(kernel = select_kernel(name)))
211211
exit(EXIT_FAILURE);
212212

213-
zone_parser_t parser = { 0 };
214-
zone_options_t options = {
215-
.non_strict = 0,
216-
.no_includes = false,
217-
.include_limit = 0,
218-
.pretty_ttls = true,
219-
.origin = { .octets = root, .length = 1 },
220-
.default_ttl = 3600,
221-
.default_class = 1,
222-
.log = { .mask = 0, .callback = 0 },
223-
.accept = { .callback = &bench_accept }
224-
};
213+
zone_parser_t parser;
214+
memset(&parser, 0, sizeof(parser));
215+
zone_options_t options;
216+
memset(&options, 0, sizeof(options));
217+
options.pretty_ttls = true;
218+
options.origin.octets = root;
219+
options.origin.length = 1;
220+
options.accept.callback = &bench_accept;
221+
options.default_ttl = 3600;
222+
options.default_class = 1;
223+
225224
zone_name_buffer_t owner;
226225
zone_rdata_buffer_t rdata;
227226
zone_buffers_t buffers = { 1, &owner, &rdata };

src/generic/base16.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ nonnull((1,3,4))
217217
static really_inline int base16_decode(
218218
const char *src, size_t srclen, uint8_t *out, size_t *outlen)
219219
{
220-
struct base16_state state = { 0 };
220+
struct base16_state state = { .eof = 0, .bytes = 0, .carry = 0 };
221221
return base16_stream_decode(&state, src, srclen, out, outlen) & !state.bytes;
222222
}
223223

0 commit comments

Comments
 (0)