Re: [libvirt] [PATCH] nwfilter: Make entries in a int-2-string map more readable

A cosmetic change that makes the entries in the int-2-string maps look more readable. Add some missing entries. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com&gt; --- src/conf/nwfilter_conf.c | 97 +++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 69 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -105,6 +105,9 @@ struct int_map { const char *val; }; +#define INTMAP_ENTRY(ATT, VAL) { .attr = ATT, .val = VAL } +#define INTMAP_ENTRY_LAST { .val = NULL } + /* * only one filter update allowed @@ -388,18 +391,10 @@ struct _virXMLAttr2Struct static const struct int_map macProtoMap[] = { - { - .attr = ETHERTYPE_ARP, - .val = "arp", - }, { - .attr = ETHERTYPE_IP, - .val = "ipv4", - }, { - .attr = ETHERTYPE_IPV6, - .val = "ipv6", - }, { - .val = NULL, - } + INTMAP_ENTRY(ETHERTYPE_ARP , "arp"), + INTMAP_ENTRY(ETHERTYPE_IP , "ipv4"), + INTMAP_ENTRY(ETHERTYPE_IPV6, "ipv6"), + INTMAP_ENTRY_LAST };