Commit f4f0e7eb0f8280ed6100c37c3af0aa66c31a8f9e
2018-01-04T08:24:43
switch back to braced array initializers
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172
diff --git a/tests/message/trailer.c b/tests/message/trailer.c
index 2094381..83fc778 100644
--- a/tests/message/trailer.c
+++ b/tests/message/trailer.c
@@ -36,14 +36,11 @@ static void assert_trailers(const char *message, struct trailer *trailers)
void test_message_trailer__simple(void)
{
- struct trailer trailers[3];
-
- trailers[0].key = "Signed-off-by";
- trailers[0].value = "foo@bar.com";
- trailers[1].key = "Signed-off-by";
- trailers[1].value = "someone@else.com";
- trailers[2].key = NULL;
- trailers[2].value = NULL;
+ struct trailer trailers[] = {
+ {"Signed-off-by", "foo@bar.com"},
+ {"Signed-off-by", "someone@else.com"},
+ {NULL, NULL},
+ };
assert_trailers(
"Message\n"
@@ -55,12 +52,10 @@ void test_message_trailer__simple(void)
void test_message_trailer__no_whitespace(void)
{
- struct trailer trailers[2];
-
- trailers[0].key = "Key";
- trailers[0].value = "value";
- trailers[1].key = NULL;
- trailers[1].value = NULL;
+ struct trailer trailers[] = {
+ {"Key", "value"},
+ {NULL, NULL},
+ };
assert_trailers(
"Message\n"
@@ -71,12 +66,10 @@ void test_message_trailer__no_whitespace(void)
void test_message_trailer__extra_whitespace(void)
{
- struct trailer trailers[2];
-
- trailers[0].key = "Key";
- trailers[0].value = "value";
- trailers[1].key = NULL;
- trailers[1].value = NULL;
+ struct trailer trailers[] = {
+ {"Key", "value"},
+ {NULL, NULL},
+ };
assert_trailers(
"Message\n"
@@ -87,12 +80,10 @@ void test_message_trailer__extra_whitespace(void)
void test_message_trailer__no_newline(void)
{
- struct trailer trailers[2];
-
- trailers[0].key = "Key";
- trailers[0].value = "value";
- trailers[1].key = NULL;
- trailers[1].value = NULL;
+ struct trailer trailers[] = {
+ {"Key", "value"},
+ {NULL, NULL},
+ };
assert_trailers(
"Message\n"
@@ -103,10 +94,9 @@ void test_message_trailer__no_newline(void)
void test_message_trailer__not_last_paragraph(void)
{
- struct trailer trailers;
-
- trailers.key = NULL;
- trailers.value = NULL;
+ struct trailer trailers[] = {
+ {NULL, NULL},
+ };
assert_trailers(
"Message\n"
@@ -114,17 +104,15 @@ void test_message_trailer__not_last_paragraph(void)
"Key: value\n"
"\n"
"More stuff\n"
- , &trailers);
+ , trailers);
}
void test_message_trailer__conflicts(void)
{
- struct trailer trailers[2];
-
- trailers[0].key = "Key";
- trailers[0].value = "value";
- trailers[1].key = NULL;
- trailers[1].value = NULL;
+ struct trailer trailers[] = {
+ {"Key", "value"},
+ {NULL, NULL},
+ };
assert_trailers(
"Message\n"
@@ -138,12 +126,10 @@ void test_message_trailer__conflicts(void)
void test_message_trailer__patch(void)
{
- struct trailer trailers[2];
-
- trailers[0].key = "Key";
- trailers[0].value = "value";
- trailers[1].key = NULL;
- trailers[1].value = NULL;
+ struct trailer trailers[] = {
+ {"Key", "value"},
+ {NULL, NULL},
+ };
assert_trailers(
"Message\n"
@@ -157,16 +143,12 @@ void test_message_trailer__patch(void)
void test_message_trailer__continuation(void)
{
- struct trailer trailers[4];
-
- trailers[0].key = "A";
- trailers[0].value = "b\n c";
- trailers[1].key = "D";
- trailers[1].value = "e\n f: g h";
- trailers[2].key = "I";
- trailers[2].value = "j";
- trailers[3].key = NULL;
- trailers[3].value = NULL;
+ struct trailer trailers[] = {
+ {"A", "b\n c"},
+ {"D", "e\n f: g h"},
+ {"I", "j"},
+ {NULL, NULL},
+ };
assert_trailers(
"Message\n"
@@ -181,14 +163,11 @@ void test_message_trailer__continuation(void)
void test_message_trailer__invalid(void)
{
- struct trailer trailers[3];
-
- trailers[0].key = "Signed-off-by";
- trailers[0].value = "some@one.com";
- trailers[1].key = "Another";
- trailers[1].value = "trailer";
- trailers[2].key = NULL;
- trailers[2].value = NULL;
+ struct trailer trailers[] = {
+ {"Signed-off-by", "some@one.com"},
+ {"Another", "trailer"},
+ {NULL, NULL},
+ };
assert_trailers(
"Message\n"