From 3ab43e02281a0173b97ec4c99e93599a6e4fd6b9 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 15 May 2018 21:41:47 +0000 Subject: [PATCH] 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. --- sockaddr.c | 8 ++++---- xlat/addrfams.in | 1 + xlat/af_packet_types.in | 1 + xlat/hci_channels.in | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sockaddr.c b/sockaddr.c index 67bad033..1e3067c4 100644 --- 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 427d993b..5824c3b7 100644 --- 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 8b96dbda..68f75152 100644 --- 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 f6fde191..42055bbe 100644 --- 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 -- 2.50.0