specifiers: introduce common macros for generating specifier tables

In many cases the tables are largely the same, hence define a common set
of macros to generate the common parts.

This adds in a couple of missing specifiers here and there, so is more
thant just refactoring: it actually fixes accidental omissions.

Note that some entries that look like they could be unified under these
macros can't really be unified, since they are slightly different. For
example in the DNSSD service logic we want to use the DNSSD hostname for
%H rather than the unmodified kernel one.

1 files changed, 1 insertions, 9 deletions

diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 0c46af05cc..6b5005f9fc 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -11,15 +11,7 @@ static void test_specifier_printf(void) {
         static const Specifier table[] = {
                 { 'X', specifier_string,         (char*) "AAAA" },
                 { 'Y', specifier_string,         (char*) "BBBB" },
-                { 'm', specifier_machine_id,     NULL },
-                { 'b', specifier_boot_id,        NULL },
-                { 'H', specifier_host_name,      NULL },
-                { 'v', specifier_kernel_release, NULL },
-                { 'a', specifier_architecture,   NULL },
-                { 'o', specifier_os_id,          NULL },
-                { 'w', specifier_os_version_id,  NULL },
-                { 'B', specifier_os_build_id,    NULL },
-                { 'W', specifier_os_variant_id,  NULL },
+                COMMON_SYSTEM_SPECIFIERS,
                 {}
         };