Commit 2521e11ce2b9b848735e89a545fc6521e45b13fc
2018-11-23T20:02:31
tests: mailmap: avoid definition of unused static variables The mailmap testdata header contains a set of static variable definitions. As these variables aren't used in all places where they are used, they trigger the unused-const-variable warnings. As we have currently disabled those warnings explicitly, they are never triggered, but we intend to enable them. Avoid the issue by only keeping variable definitions that are actually used in all locations. Move the others to where they are used.
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
diff --git a/tests/mailmap/mailmap_testdata.h b/tests/mailmap/mailmap_testdata.h
index 173536d..a06606b 100644
--- a/tests/mailmap/mailmap_testdata.h
+++ b/tests/mailmap/mailmap_testdata.h
@@ -7,29 +7,6 @@ typedef struct mailmap_entry {
const char *replace_email;
} mailmap_entry;
-static const char string_mailmap[] =
- "# Simple Comment line\n"
- "<cto@company.xx> <cto@coompany.xx>\n"
- "Some Dude <some@dude.xx> nick1 <bugs@company.xx>\n"
- "Other Author <other@author.xx> nick2 <bugs@company.xx>\n"
- "Other Author <other@author.xx> <nick2@company.xx>\n"
- "Phil Hill <phil@company.xx> # Comment at end of line\n"
- "<joseph@company.xx> Joseph <bugs@company.xx>\n"
- "Santa Claus <santa.claus@northpole.xx> <me@company.xx>\n"
- "Untracked <untracked@company.xx>";
-
-static const mailmap_entry entries[] = {
- { NULL, "cto@company.xx", NULL, "cto@coompany.xx" },
- { "Some Dude", "some@dude.xx", "nick1", "bugs@company.xx" },
- { "Other Author", "other@author.xx", "nick2", "bugs@company.xx" },
- { "Other Author", "other@author.xx", NULL, "nick2@company.xx" },
- { "Phil Hill", NULL, NULL, "phil@company.xx" },
- { NULL, "joseph@company.xx", "Joseph", "bugs@company.xx" },
- { "Santa Claus", "santa.claus@northpole.xx", NULL, "me@company.xx" },
- /* This entry isn't in the bare repository */
- { "Untracked", NULL, NULL, "untracked@company.xx" }
-};
-
static const mailmap_entry resolved[] = {
{ "Brad", "cto@company.xx", "Brad", "cto@coompany.xx" },
{ "Brad L", "cto@company.xx", "Brad L", "cto@coompany.xx" },
diff --git a/tests/mailmap/parsing.c b/tests/mailmap/parsing.c
index dc5096c..e2ab05c 100644
--- a/tests/mailmap/parsing.c
+++ b/tests/mailmap/parsing.c
@@ -8,6 +8,29 @@ static git_repository *g_repo;
static git_mailmap *g_mailmap;
static git_config *g_config;
+static const char string_mailmap[] =
+ "# Simple Comment line\n"
+ "<cto@company.xx> <cto@coompany.xx>\n"
+ "Some Dude <some@dude.xx> nick1 <bugs@company.xx>\n"
+ "Other Author <other@author.xx> nick2 <bugs@company.xx>\n"
+ "Other Author <other@author.xx> <nick2@company.xx>\n"
+ "Phil Hill <phil@company.xx> # Comment at end of line\n"
+ "<joseph@company.xx> Joseph <bugs@company.xx>\n"
+ "Santa Claus <santa.claus@northpole.xx> <me@company.xx>\n"
+ "Untracked <untracked@company.xx>";
+
+static const mailmap_entry entries[] = {
+ { NULL, "cto@company.xx", NULL, "cto@coompany.xx" },
+ { "Some Dude", "some@dude.xx", "nick1", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", "nick2", "bugs@company.xx" },
+ { "Other Author", "other@author.xx", NULL, "nick2@company.xx" },
+ { "Phil Hill", NULL, NULL, "phil@company.xx" },
+ { NULL, "joseph@company.xx", "Joseph", "bugs@company.xx" },
+ { "Santa Claus", "santa.claus@northpole.xx", NULL, "me@company.xx" },
+ /* This entry isn't in the bare repository */
+ { "Untracked", NULL, NULL, "untracked@company.xx" }
+};
+
void test_mailmap_parsing__initialize(void)
{
g_repo = NULL;