sockaddr: use printxval_index lookup instead of printxval

* xlat/addrfams.in: Add "#value_indexed" directive.
* xlat/af_packet_types.in: Likewise.
* xlat/hci_channels.in: Likewise.
* sockaddr.c (print_sockaddr_data_bt, print_sockaddr,
* print_sockaddr_data_ll): Use printxval_index instead of printxval.

diff --git a/sockaddr.c b/sockaddr.c
index 67bad03352328f96c8e3b0ed6db3c6e68df2986c..1e3067c435540383c22b0ce19924886937450b57 100644 (file)
--- a/sockaddr.c
+++ b/sockaddr.c
@@ -226,7 +226,7 @@ print_sockaddr_data_ll(const void *const buf, const int addrlen)
        tprints(", sll_hatype=");
        printxval_search(arp_hardware_types, sa_ll->sll_hatype, "ARPHRD_???");
        tprints(", sll_pkttype=");
-       printxval(af_packet_types, sa_ll->sll_pkttype, "PACKET_???");
+       printxval_index(af_packet_types, sa_ll->sll_pkttype, "PACKET_???");
        tprintf(", sll_halen=%u", sa_ll->sll_halen);
        if (sa_ll->sll_halen) {
                const unsigned int oob_halen =
@@ -378,8 +378,8 @@ print_sockaddr_data_bt(const void *const buf, const int addrlen)
                        const struct sockaddr_hci *const hci = buf;
                        tprintf("hci_dev=htobs(%hu), hci_channel=",
                                btohs(hci->hci_dev));
-                       printxval(hci_channels, hci->hci_channel,
-                                 "HCI_CHANNEL_???");
+                       printxval_index(hci_channels, hci->hci_channel,
+                                       "HCI_CHANNEL_???");
                        break;
                }
                case sizeof(struct sockaddr_sco): {
@@ -433,7 +433,7 @@ print_sockaddr(const void *const buf, const int addrlen)
        const struct sockaddr *const sa = buf;
 
        tprints("{sa_family=");
-       printxval(addrfams, sa->sa_family, "AF_???");
+       printxval_index(addrfams, sa->sa_family, "AF_???");
 
        if (addrlen > (int) SIZEOF_SA_FAMILY) {
                tprints(", ");

diff --git a/xlat/addrfams.in b/xlat/addrfams.in
index 427d993b4318026d2bf9def55c89a3b5296eb1e9..5824c3b75f85e8bef6ad260d41223a2944ec90a8 100644 (file)
--- a/xlat/addrfams.in
+++ b/xlat/addrfams.in
@@ -1,3 +1,4 @@
+#value_indexed
 AF_UNSPEC      0
 AF_UNIX                1
 AF_INET                2

diff --git a/xlat/af_packet_types.in b/xlat/af_packet_types.in
index 8b96dbdabcbed92457b1f788c031ff5c7649b299..68f7515267ee61103fa86f1818fbcfe101e43306 100644 (file)
--- a/xlat/af_packet_types.in
+++ b/xlat/af_packet_types.in
@@ -1,3 +1,4 @@
+#value_indexed
 PACKET_HOST            0
 PACKET_BROADCAST       1
 PACKET_MULTICAST       2

diff --git a/xlat/hci_channels.in b/xlat/hci_channels.in
index f6fde191a1829e024b44d5b505b74d76cfe9549c..42055bbee19791b5a3c5ee4bd3c20317073e282c 100644 (file)
--- a/xlat/hci_channels.in
+++ b/xlat/hci_channels.in
@@ -1,3 +1,4 @@
+#value_indexed
 HCI_CHANNEL_RAW                0
 HCI_CHANNEL_USER       1
 HCI_CHANNEL_MONITOR    2