861f9fd7d8
Rename struct xlat to struct xlat_data and make struct xlat an xlat descriptor that contains various information about xlat. So far, it's type and number of items. As a result, xlookup/printxval now have enought information for handling xlat depending on its type, so no *index/*_search APIs are needed. * xlat.h (struct xlat_data): Rename from struct xlat. (struct xlat): New type definition. * xlat.c (xlat_search, printxval_sized, printxval_searchn_ex, xlat_idx, printxval_indexn_ex, printxval_dispatch_ex, ): Remove. (xlookup): Handle xlat_data based on xlat type. (xlookup_le): New function, replaces xlat_search_eq_or_less and supports all xlat types. (sprintflags_ex, printflags_ex): Update. * xlat/gen.sh (gen_header): Add handling for #sorted, generate new struct xlat descriptor. * defs.h (arp_hardware_types_size, ethernet_protocols_size, inet_protocols_size, evdev_abs_size, xlat_search, xlat_search_eq_or_less, xlat_idx, printxval_searchn_ex, printxval_searchn, printxval_search, printxval_search_ex, printxval_indexn_ex, printxval_indexn, printxval_index, printxval_index_ex, printxval_dispatch_ex, printxval_dispatch): Remove. (enum xlat_style_private_flag_bits): Remove PAF_INDEX_XLAT_SORTED_BIT and PAF_INDEX_XLAT_VALUE_INDEXED_BIT. (enum xlat_style_private_flag): Remove PAF_INDEX_XLAT_SORTED and PAF_INDEX_XLAT_VALUE_INDEXED. (print_array_ex): Remove index_xlat_size argument. (xlookup_le): New declaration. (printxval_ex): New macro. * dyxlat.c (struct dyxlat): Remove used field (use xlat.size instead), embed struct xlat, add pointer to struct xlat_data. (MARK_END): Remove. (dyxlat_alloc, dyxlat_free, dyxlat_get, dyxlat_add_pair): Update in accordance with the structure changes. * evdev.c (evdev_abs_size): Remove. (keycode_ioctl): Use printxval instead of printxval_index. (decode_bitset): Remove. (decode_bitset_): Rename to decode_bitset, remove decode_nr_size and xt arguments, call printxval instead of printxval_dispatch. (bit_ioctl, evdev_read_ioctl): Do not pass xlat type to decode_bitset. * print_fields.h (PRINT_FIELD_XVAL_SORTED_SIZED, PRINT_FIELD_XVAL_INDEX): Remove. * nlattr.h (struct decode_nla_xlat_opts): Remove xlat_size and xt fields. * nlattr.c (decode_nla_meminfo): do not pass PAF_INDEX_XLAT_VALUE_INDEXED flag and netlink_sk_meminfo_indices size in a print_array_ex call. (decode_nla_xval): Call printxval_ex instead of printxval_dispatch_ex. (decode_nla_ether_proto, decode_nla_ip_proto): Do not pass xlat_size and xt fields in opts. (decode_nla_flags): Remove XT_INDEXED unsupported warning. * process.c (struct_user_offsets_data): Rename from struct_user_offsets, change type to struct xlat_data[], remove XLAT_END. (struct_user_offsets): New xlat description. (print_user_offset_addr): Rewrite using xlookup_le. * util.c (print_array_ex): Remove index_xlat_size argument, simply call printxval_ex for index printing. * aio.c (tprint_lio_opcode): Use printxval_ex instead of printxval_indexn_ex. * bpf.c: Use printxval instead of printxval_index; use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_INDEX. * bpf_filter.c (print_bpf_filter_code): Use printxval instead of printxval_index. * ioctl.c (evdev_decode_number): Use printxval instead of printxval_indexn. * kvm.c (kvm_ioctl_decode_check_extension): Use printxval instead of printxval_index. (kvm_ioctl_run_attach_auxstr): Use xlookup instead of xlat_idx. * net.c: Use printxval instead of printxval_search/printxval_index, use printxval_ex instead of printxval_searchn_ex. * netlink_packet_diag.c (decode_packet_diag_msg): Use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_SORTED_SIZED. * netlink_smc_diag.c (decode_smc_diag_shutdown): Remove ARRSZ_PAIR wrapper. (decode_smc_diag_fallback): Use printxval_ex instead of printxval_search_ex. (decode_smc_diag_msg): Use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_INDEX. * print_statfs.c (print_statfs_type): Use printxval instead of printxval_search. * rtnl_cachereport.c (decode_nla_ipmra_msg_type, decode_nla_ip6mra_msg_type): Remove ARRSZ_PAIR wrappers, xt fields. * rtnl_link.c (decode_ifla_inet6_flags, decode_ifla_inet6_agm): Likewise. (decode_nla_tun_type, decode_ifla_xdp_attached): Remove xlat_size, xt fields. (decode_ifla_inet_conf, decode_ifla_inet6_conf, decode_ifla_inet6_stats, decode_ifla_inet6_icmp6_stats): Remove PAF_INDEX_XLAT_VALUE_INDEXED flag and ARRSZ_PAIR wrapper in print_array_ex calls. (decode_ifinfomsg): Use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_SORTED_SIZED. * rtnl_route.c (decode_nla_rt_proto): Use printxval instead of printxval_search. * sock.c (print_ifreq): Use PRINT_FIELD_XVAL instead of PRINT_FIELD_XVAL_SORTED_SIZED. * sockaddr.c (print_sockaddr_data_ll, print_sockaddr_data_bt, print_sockaddr): Use printxval instead of printxval_search and printxval_index. * time.c (getitimer, osf_getitimer, setitimer, printclockname): Use printxval instead of printxval_index. (do_adjtimex): Use xlookup instead of xlat_idx. * v4l2.c (print_v4l2_cid): Use xlookup instead of xlat_search. (print_v4l2_cid): Use xlookup_le instead of xlat_search_eq_or_less. * tests/btrfs.c: Update xlat handling, use struct xlat_data instead of struct xlat for XLAT() arrays. * tests/ioctl_block.c: Likewise. * tests/ioctl_rtc.c: Likewise. * tests/printflags.c: Likewise. * tests/printxval.c: Likewise. * tests/prlimit64.c: Likewise. * tests/setrlimit.c: Likewise. * tests/socketcall.c: Likewise. * tests/xgetrlimit.c: Likewise. * tests/xstatfsx.c: Likewise. * xlat/af_packet_versions.in: Add #value_indexed. * xlat/arp_hardware_types.in: Add #sorted. * xlat/ax25_protocols.in: Likewise. * xlat/bluetooth_l2_cid.in: Likewise. * xlat/bluetooth_l2_psm.in: Likewise. * xlat/ethernet_protocols.in: Likewise. * xlat/evdev_ff_types.in: Likewise. * xlat/fsmagic.in: Likewise. * xlat/hw_breakpoint_type.in: Likewise. * xlat/iffflags.in: Likewise. * xlat/inet6_if_flags.in: Likewise. * xlat/inet_protocols.in: Likewise. * xlat/msgctl_flags.in: Likewise. * xlat/perf_hw_cache_id.in: Likewise. * xlat/perf_hw_cache_op_id.in: Likewise. * xlat/perf_hw_cache_op_result_id.in: Likewise. * xlat/perf_hw_id.in: Likewise. * xlat/perf_sw_ids.in: Likewise. * xlat/perf_type_id.in: Likewise. * xlat/routing_protocols.in: Likewise. * xlat/semctl_flags.in: Likewise. * xlat/shmctl_flags.in: Likewise. * xlat/smc_decl_codes.in: Likewise. * xlat/sock_ax25_options.in: Likewise. * xlat/sock_bluetooth_options.in: Likewise. * xlat/sock_dccp_options.in: Likewise. * xlat/sock_tipc_options.in: Likewise. * xlat/socketlayers.in: Likewise. * xlat/v4l2_control_classes.in: Likewise. * xlat/v4l2_pix_fmts.in: Likewise. * xlat/v4l2_sdr_fmts.in: Likewise.
97 lines
2.9 KiB
C
97 lines
2.9 KiB
C
/*
|
|
* Copyright (c) 2017 The strace developers.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "defs.h"
|
|
|
|
struct dyxlat {
|
|
size_t allocated;
|
|
struct xlat xlat;
|
|
struct xlat_data *data;
|
|
};
|
|
|
|
struct dyxlat *
|
|
dyxlat_alloc(const size_t nmemb)
|
|
{
|
|
struct dyxlat *const dyxlat = xmalloc(sizeof(*dyxlat));
|
|
|
|
dyxlat->xlat.type = XT_NORMAL;
|
|
dyxlat->xlat.size = 0;
|
|
dyxlat->allocated = nmemb;
|
|
dyxlat->xlat.data = dyxlat->data = xgrowarray(NULL, &dyxlat->allocated,
|
|
sizeof(struct xlat_data));
|
|
|
|
return dyxlat;
|
|
}
|
|
|
|
void
|
|
dyxlat_free(struct dyxlat *const dyxlat)
|
|
{
|
|
size_t i;
|
|
|
|
for (i = 0; i < dyxlat->xlat.size; ++i) {
|
|
free((void *) dyxlat->data[i].str);
|
|
dyxlat->data[i].str = NULL;
|
|
}
|
|
|
|
free(dyxlat->data);
|
|
dyxlat->xlat.data = NULL;
|
|
free(dyxlat);
|
|
}
|
|
|
|
const struct xlat *
|
|
dyxlat_get(const struct dyxlat *const dyxlat)
|
|
{
|
|
return &dyxlat->xlat;
|
|
}
|
|
|
|
void
|
|
dyxlat_add_pair(struct dyxlat *const dyxlat, const uint64_t val,
|
|
const char *const str, const size_t len)
|
|
{
|
|
size_t i;
|
|
|
|
for (i = 0; i < dyxlat->xlat.size; ++i) {
|
|
if (dyxlat->data[i].val == val) {
|
|
if (strncmp(dyxlat->data[i].str, str, len) == 0
|
|
&& dyxlat->data[i].str[len] == '\0')
|
|
return;
|
|
|
|
free((void *) dyxlat->data[i].str);
|
|
dyxlat->data[i].str = xstrndup(str, len);
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (dyxlat->xlat.size >= dyxlat->allocated)
|
|
dyxlat->xlat.data = dyxlat->data =
|
|
xgrowarray(dyxlat->data, &dyxlat->allocated,
|
|
sizeof(struct xlat_data));
|
|
|
|
dyxlat->data[dyxlat->xlat.size].val = val;
|
|
dyxlat->data[dyxlat->xlat.size].str = xstrndup(str, len);
|
|
dyxlat->xlat.size++;
|
|
}
|