diff options
author | Evan Huus <eapache@gmail.com> | 2021-07-16 11:36:34 -0400 |
---|---|---|
committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-21 05:38:29 +0000 |
commit | d6d7dd1e5664810b368231d03d56465112e3d82e (patch) | |
tree | 4f95a8b408e58b8edc0b4a2c17831b58049beaf3 /plugins/epan/profinet/packet-dcom-cba-acco.c | |
parent | ef542759d0c7003a495436f2194d5821bfc30bd4 (diff) |
First pass pinfo->pool conversion
Automated find/replace of wmem_packet_scope() with pinfo->pool in all
files where it didn't cause a build failure.
I also tweaked a few of the docs which got caught up.
Diffstat (limited to 'plugins/epan/profinet/packet-dcom-cba-acco.c')
-rw-r--r-- | plugins/epan/profinet/packet-dcom-cba-acco.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/epan/profinet/packet-dcom-cba-acco.c b/plugins/epan/profinet/packet-dcom-cba-acco.c index ae6e268421..1b5d4cc1cd 100644 --- a/plugins/epan/profinet/packet-dcom-cba-acco.c +++ b/plugins/epan/profinet/packet-dcom-cba-acco.c @@ -418,7 +418,7 @@ cba_object_dump(void) for(pdevs = cba_pdevs; pdevs != NULL; pdevs = g_list_next(pdevs)) { pdev = pdevs->data; set_address(&addr, AT_IPv4, 4, pdev->ip); - ws_debug_printf("PDev #%5u: %s IFs:%u", pdev->first_packet, address_to_str(wmem_packet_scope(), &addr), + ws_debug_printf("PDev #%5u: %s IFs:%u", pdev->first_packet, address_to_str(pinfo->pool, &addr), pdev->object ? g_list_length(pdev->object->interfaces) : 0); for(ldevs = pdev->ldevs; ldevs != NULL; ldevs = g_list_next(ldevs)) { @@ -470,11 +470,11 @@ cba_pdev_find(packet_info *pinfo, const address *addr, e_guid_t *ipid) pdev = (cba_pdev_t *)interf->parent->private_data; if (pdev == NULL) { expert_add_info_format(pinfo, NULL, &ei_cba_acco_pdev_find, "pdev_find: no pdev for IP:%s IPID:%s", - address_to_str(wmem_packet_scope(), addr), guids_resolve_guid_to_str(ipid)); + address_to_str(pinfo->pool, addr), guids_resolve_guid_to_str(ipid)); } } else { expert_add_info_format(pinfo, NULL, &ei_cba_acco_pdev_find_unknown_interface, "pdev_find: unknown interface of IP:%s IPID:%s", - address_to_str(wmem_packet_scope(), addr), guids_resolve_guid_to_str(ipid)); + address_to_str(pinfo->pool, addr), guids_resolve_guid_to_str(ipid)); pdev = NULL; } @@ -597,11 +597,11 @@ cba_ldev_find(packet_info *pinfo, const address *addr, e_guid_t *ipid) { } if (ldev == NULL) { expert_add_info_format(pinfo, NULL, &ei_cba_acco_ldev_unknown, "Unknown LDev of %s", - address_to_str(wmem_packet_scope(), addr)); + address_to_str(pinfo->pool, addr)); } } else { expert_add_info_format(pinfo, NULL, &ei_cba_acco_ipid_unknown, "Unknown IPID of %s", - address_to_str(wmem_packet_scope(), addr)); + address_to_str(pinfo->pool, addr)); ldev = NULL; } |