Skip to content

Commit f66200a

Browse files
k0ekk0ekk0ekk0ek
committed
Fix compilation warnings for GCC 4.2.1
1 parent 9974d83 commit f66200a

File tree

8 files changed

+52
-32
lines changed

8 files changed

+52
-32
lines changed

‎tests/base32.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,18 @@ void base32_syntax(void **state)
6868
for (size_t i=0, n=sizeof(tests)/sizeof(tests[0]); i < n; i++) {
6969
char rr[256];
7070
const char rrfmt[] = "foo. NSEC3 1 1 12 aabbccdd ( %s A NS )";
71-
zone_parser_t parser = { 0 };
71+
zone_parser_t parser;
7272
zone_name_buffer_t name;
7373
zone_rdata_buffer_t rdata;
7474
zone_buffers_t buffers = { 1, &name, &rdata };
75-
zone_options_t options = { 0 };
75+
zone_options_t options;
7676
int32_t result;
7777

7878
(void)snprintf(rr, sizeof(rr), rrfmt, tests[i].base32);
7979

8080
fprintf(stderr, "INPUT: '%s'\n", rr);
8181

82+
memset(&options, 0, sizeof(options));
8283
options.accept.callback = add_rr;
8384
options.origin.octets = origin;
8485
options.origin.length = sizeof(origin);

‎tests/eui.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,17 @@ void eui48_and_eui64(void **state)
107107
(void)state;
108108

109109
for (size_t i=0, n=sizeof(tests)/sizeof(tests[0]); i < n; i++) {
110-
zone_parser_t parser = { 0 };
110+
zone_parser_t parser;
111111
zone_name_buffer_t name;
112112
zone_rdata_buffer_t rdata;
113113
zone_buffers_t buffers = { 1, &name, &rdata };
114-
zone_options_t options = { 0 };
114+
zone_options_t options;
115115
int32_t code;
116116
const struct eui_test *test = &tests[i];
117117

118118
fprintf(stderr, "INPUT: %s\n", test->text);
119119

120+
memset(&options, 0, sizeof(options));
120121
options.accept.callback = accept_eui48_and_eui64;
121122
options.origin.octets = origin;
122123
options.origin.length = sizeof(origin);

‎tests/include.c

+12-7
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static char *generate_include(const char *text)
163163
static int32_t parse(
164164
const zone_options_t *options, const char *text, void *user_data)
165165
{
166-
zone_parser_t parser = { 0 };
166+
zone_parser_t parser;
167167
zone_name_buffer_t name;
168168
zone_rdata_buffer_t rdata;
169169
zone_buffers_t buffers = { 1, &name, &rdata };
@@ -214,13 +214,14 @@ static uint8_t origin[] =
214214
void include_from_string(void **state)
215215
{
216216
input_t *input;
217-
zone_parser_t parser = { 0 };
217+
zone_parser_t parser;
218218
zone_name_buffer_t name;
219219
zone_rdata_buffer_t rdata;
220220
zone_buffers_t buffers = { 1, &name, &rdata };
221-
zone_options_t options = { 0 };
221+
zone_options_t options;
222222
int32_t result;
223223

224+
memset(&options, 0, sizeof(options));
224225
options.accept.callback = &add_rr;
225226
options.origin.octets = origin;
226227
options.origin.length = sizeof(origin);
@@ -287,10 +288,11 @@ static void no_such_file_log(
287288
void the_include_that_wasnt(void **state)
288289
{
289290
// test $INCLUDE of nonexistent file is handled gracefully
290-
zone_options_t options = { 0 };
291-
no_file_test_t test = { 0 };
291+
zone_options_t options;
292+
no_file_test_t test;
292293
int32_t code;
293294

295+
memset(&options, 0, sizeof(options));
294296
options.accept.callback = &no_such_file_accept;
295297
options.log.callback = &no_such_file_log;
296298
options.origin.octets = origin;
@@ -311,6 +313,7 @@ void the_include_that_wasnt(void **state)
311313
assert_non_null(include);
312314
(void)snprintf(include, (size_t)length + 1, "$INCLUDE %s", non_include);
313315

316+
memset(&test, 0, sizeof(test));
314317
code = parse(&options, include, &test);
315318
free(include);
316319
free(non_include);
@@ -360,8 +363,9 @@ void in_too_deep(void **state)
360363

361364
int32_t code;
362365
size_t records;
363-
zone_options_t options = { 0 };
366+
zone_options_t options;
364367

368+
memset(&options, 0, sizeof(options));
365369
options.accept.callback = &in_too_deep_accept;
366370
options.log.callback = &in_too_deep_log;
367371
options.origin.octets = origin;
@@ -413,7 +417,8 @@ void been_there_done_that(void **state)
413417
{
414418
(void)state;
415419

416-
zone_options_t options = { 0 };
420+
zone_options_t options;
421+
memset(&options, 0, sizeof(options));
417422
options.accept.callback = &in_too_deep_accept;
418423
options.log.callback = &in_too_deep_log;
419424
options.origin.octets = origin;

‎tests/ip4.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,18 @@ void ipv4_syntax(void **state)
8282

8383
for (size_t i=0, n=sizeof(tests)/sizeof(tests[0]); i < n; i++) {
8484
char rr[128];
85-
zone_parser_t parser = { 0 };
85+
zone_parser_t parser;
8686
zone_name_buffer_t name;
8787
zone_rdata_buffer_t rdata;
8888
zone_buffers_t buffers = { 1, &name, &rdata };
89-
zone_options_t options = { 0 };
89+
zone_options_t options;
9090
int32_t result;
9191

9292
(void)snprintf(rr, sizeof(rr), "foo. A %s", tests[i].address);
9393

9494
fprintf(stderr, "INPUT: %s\n", rr);
9595

96+
memset(&options, 0, sizeof(options));
9697
options.accept.callback = add_rr;
9798
options.origin.octets = origin;
9899
options.origin.length = sizeof(origin);

‎tests/svcb.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -816,13 +816,14 @@ void rfc9460_test_vectors(void **state)
816816

817817
for (size_t i = 0, n = sizeof(tests)/sizeof(tests[0]); i < n; i++) {
818818
const test_t *test = &tests[i];
819-
zone_parser_t parser = { 0 };
819+
zone_parser_t parser;
820820
zone_name_buffer_t name;
821821
zone_rdata_buffer_t rdata;
822822
zone_buffers_t buffers = { 1, &name, &rdata };
823-
zone_options_t options = { 0 };
823+
zone_options_t options;
824824
int32_t code;
825825

826+
memset(&options, 0, sizeof(options));
826827
options.non_strict = tests[i].secondary;
827828
options.accept.callback = add_rr;
828829
options.origin.octets = origin;

‎tests/syntax.c

+22-13
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,14 @@ void newlines(void **state)
9999
(void)state;
100100

101101
for (size_t i=0, n = sizeof(tests)/sizeof(tests[0]); i < n; i++) {
102-
zone_parser_t parser = { 0 };
102+
zone_parser_t parser;
103103
zone_name_buffer_t name;
104104
zone_rdata_buffer_t rdata;
105105
zone_buffers_t buffers = { 1, &name, &rdata };
106-
zone_options_t options = { 0 };
106+
zone_options_t options;
107107
int32_t result;
108108

109+
memset(&options, 0, sizeof(options));
109110
options.accept.callback = newline_test_accept_rr;
110111
options.origin.octets = origin;
111112
options.origin.length = sizeof(origin);
@@ -238,18 +239,19 @@ void strings(void **state)
238239
static const uint8_t origin[] = { 3, 'f', 'o', 'o', 0 };
239240

240241
for (size_t i=0, n=sizeof(tests)/sizeof(tests[0]); i < n; i++) {
241-
zone_parser_t parser = { 0 };
242+
zone_parser_t parser;
242243
zone_name_buffer_t name;
243244
zone_rdata_buffer_t rdata;
244245
zone_buffers_t buffers = { 1, &name, &rdata };
245-
zone_options_t options = { 0 };
246+
zone_options_t options;
246247
char input[512] = { 0 };
247248
size_t length;
248249
int32_t code;
249250

250251
(void)snprintf(input, sizeof(input), "foo. TXT %s", tests[i].text);
251252
length = strlen(input);
252253

254+
memset(&options, 0, sizeof(options));
253255
options.accept.callback = strings_callback;
254256
options.origin.octets = origin;
255257
options.origin.length = sizeof(origin);
@@ -436,18 +438,19 @@ void names(void **state)
436438
static const uint8_t origin[] = { 3, 'f', 'o', 'o', 0 };
437439

438440
for (size_t i=0, n=sizeof(tests)/sizeof(tests[0]); i < n; i++) {
439-
zone_parser_t parser = { 0 };
441+
zone_parser_t parser;
440442
zone_name_buffer_t name;
441443
zone_rdata_buffer_t rdata;
442444
zone_buffers_t buffers = { 1, &name, &rdata };
443-
zone_options_t options = { 0 };
445+
zone_options_t options;
444446
char input[512] = { 0 };
445447
size_t length;
446448
int32_t code;
447449

448450
(void)snprintf(input, sizeof(input), "%s A 192.168.0.1", tests[i].input);
449451
length = strlen(input);
450452

453+
memset(&options, 0, sizeof(options));
451454
options.accept.callback = names_callback;
452455
options.origin.octets = origin;
453456
options.origin.length = sizeof(origin);
@@ -513,15 +516,16 @@ void ttls(void **state)
513516
static const uint8_t origin[] = { 3, 'f', 'o', 'o', 0 };
514517

515518
for (size_t i=0, n=sizeof(tests)/sizeof(tests[0]); i < n; i++) {
516-
zone_parser_t parser = { 0 };
519+
zone_parser_t parser;
517520
zone_name_buffer_t name;
518521
zone_rdata_buffer_t rdata;
519522
zone_buffers_t buffers = { 1, &name, &rdata };
520-
zone_options_t options = { 0 };
523+
zone_options_t options;
521524
const char *str = tests[i].text;
522525
size_t len = strlen(str);
523526
int32_t code;
524527

528+
memset(&options, 0, sizeof(options));
525529
options.accept.callback = tests_callback;
526530
options.origin.octets = origin;
527531
options.origin.length = sizeof(origin);
@@ -567,9 +571,10 @@ static int32_t parse(const char *text, size_t *count)
567571
zone_name_buffer_t name;
568572
zone_rdata_buffer_t rdata;
569573
zone_buffers_t buffers = { 1, &name, &rdata };
570-
zone_options_t options = { 0 };
574+
zone_options_t options;
571575
const uint8_t origin[] = { 0 };
572576

577+
memset(&options, 0, sizeof(options));
573578
options.accept.callback = &dummy_callback;
574579
options.origin.octets = origin;
575580
options.origin.length = sizeof(origin);
@@ -828,9 +833,10 @@ void include_with_origin(void **state)
828833
zone_name_buffer_t name;
829834
zone_rdata_buffer_t rdata;
830835
zone_buffers_t buffers = { 1, &name, &rdata };
831-
zone_options_t options = { 0 };
836+
zone_options_t options;
832837
static const uint8_t origin[] = { 3, 'b', 'a', 'r', 0 };
833838

839+
memset(&options, 0, sizeof(options));
834840
options.accept.callback = &include_origin_callback;
835841
options.origin.octets = origin;
836842
options.origin.length = sizeof(origin);
@@ -893,9 +899,10 @@ void include_without_origin(void **state)
893899
zone_name_buffer_t name;
894900
zone_rdata_buffer_t rdata;
895901
zone_buffers_t buffers = { 1, &name, &rdata };
896-
zone_options_t options = { 0 };
902+
zone_options_t options;
897903
static const uint8_t origin[] = { 3, 'b', 'a', 'r', 0 };
898904

905+
memset(&options, 0, sizeof(options));
899906
options.accept.callback = &no_origin_callback;
900907
options.origin.octets = origin;
901908
options.origin.length = sizeof(origin);
@@ -977,9 +984,10 @@ void owner_is_reinstated(void **state)
977984
zone_name_buffer_t name;
978985
zone_rdata_buffer_t rdata;
979986
zone_buffers_t buffers = { 1, &name, &rdata };
980-
zone_options_t options = { 0 };
987+
zone_options_t options;
981988
static const uint8_t origin[] = { 3, 'b', 'a', 'r', 0 };
982989

990+
memset(&options, 0, sizeof(options));
983991
options.accept.callback = &reinstate_callback;
984992
options.origin.octets = origin;
985993
options.origin.length = sizeof(origin);
@@ -1019,9 +1027,10 @@ void origin_is_reinstated(void **state)
10191027
zone_name_buffer_t name;
10201028
zone_rdata_buffer_t rdata;
10211029
zone_buffers_t buffers = { 1, &name, &rdata };
1022-
zone_options_t options = { 0 };
1030+
zone_options_t options;
10231031
static const uint8_t origin[] = { 3, 'b', 'a', 'r', 0 };
10241032

1033+
memset(&options, 0, sizeof(options));
10251034
options.accept.callback = &reinstate_callback;
10261035
options.origin.octets = origin;
10271036
options.origin.length = sizeof(origin);

‎tests/time.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ void time_stamp_syntax(void **state)
8080
(void)state;
8181

8282
for (size_t i=0, n=sizeof(tests)/sizeof(tests[0]); i < n; i++) {
83-
zone_parser_t parser = { 0 };
83+
zone_parser_t parser;
8484
zone_name_buffer_t name;
8585
zone_rdata_buffer_t rdata;
8686
zone_buffers_t buffers = { 1, &name, &rdata };
87-
zone_options_t options = { 0 };
87+
zone_options_t options;
8888
int32_t result;
8989

9090
#define FORMAT "host.example.com. 86400 IN RRSIG A 5 3 86400 %s (\n" \
@@ -100,6 +100,7 @@ void time_stamp_syntax(void **state)
100100
(void)snprintf(rr, size, FORMAT, tests[i].timestamp);
101101

102102
fprintf(stderr, "INPUT: %s\n", rr);
103+
memset(&options, 0, sizeof(options));
103104
options.accept.callback = add_rr;
104105
options.origin.octets = origin;
105106
options.origin.length = sizeof(origin);

‎tests/types.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1023,13 +1023,14 @@ void supported_types(void **state)
10231023

10241024
for (size_t i = 0, n = sizeof(tests)/sizeof(tests[0]); i < n; i++) {
10251025
test_t test = tests[i];
1026-
zone_parser_t parser = { 0 };
1026+
zone_parser_t parser;
10271027
zone_name_buffer_t name;
10281028
zone_rdata_buffer_t rdata;
10291029
zone_buffers_t buffers = { 1, &name, &rdata };
1030-
zone_options_t options = { 0 };
1030+
zone_options_t options;
10311031
int32_t result;
10321032

1033+
memset(&options, 0, sizeof(options));
10331034
options.accept.callback = add_rr;
10341035
options.origin.octets = origin;
10351036
options.origin.length = sizeof(origin);

0 commit comments

Comments
 (0)