diff options
| author | Evan Huus <eapache@gmail.com> | 2013-11-23 22:17:27 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-11-23 22:17:27 +0000 |
| commit | d97c9e2ff4b28835e3485e643a93ef53f778370f (patch) | |
| tree | 765d426cd6fc5cb4e622c7446c24267147f2f647 | |
| parent | df1aec4a6b01f9d600288b518fece5f035c27f9f (diff) | |
Implement address_to_str which is like ep_address_to_str and se_address_to_str
except it takes a wmem scope instead. Add the two emem equivalents to checkAPI
as (weakly) deprecated.
svn path=/trunk/; revision=53528
| -rw-r--r-- | epan/address_to_str.c | 11 | ||||
| -rw-r--r-- | epan/to_str.h | 4 | ||||
| -rwxr-xr-x | tools/checkAPIs.pl | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/epan/address_to_str.c b/epan/address_to_str.c index 5fefbcd80c..b0da2f4e57 100644 --- a/epan/address_to_str.c +++ b/epan/address_to_str.c @@ -62,6 +62,7 @@ #include <epan/dissectors/packet-mtp3.h> #include <stdio.h> #include "emem.h" +#include "wmem/wmem.h" /* * If a user _does_ pass in a too-small buffer, this is probably @@ -506,6 +507,16 @@ get_ax25_name(const guint8 *ad) /* convert an address struct into a printable string */ gchar* +address_to_str(wmem_allocator_t *scope, const address *addr) +{ + gchar *str; + + str=(gchar *)wmem_alloc(scope, MAX_ADDR_STR_LEN); + address_to_str_buf(addr, str, MAX_ADDR_STR_LEN); + return str; +} + +gchar* ep_address_to_str(const address *addr) { gchar *str; diff --git a/epan/to_str.h b/epan/to_str.h index 7e41394337..f195976ffc 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -31,6 +31,7 @@ #include "time_fmt.h" #include <epan/packet_info.h> #include "ws_symbol_export.h" +#include "wmem/wmem.h" #define GUID_STR_LEN 37 #define MAX_IP_STR_LEN 16 @@ -50,7 +51,8 @@ extern "C" { struct e_in6_addr; -WS_DLL_PUBLIC gchar* ep_address_to_str(const address *); +WS_DLL_PUBLIC gchar* address_to_str(wmem_allocator_t *scope, const address *addr); +WS_DLL_PUBLIC gchar* ep_address_to_str(const address *); extern gchar* se_address_to_str(const address *); WS_DLL_PUBLIC void address_to_str_buf(const address *addr, gchar *buf, int buf_len); WS_DLL_PUBLIC const gchar* ether_to_str(const guint8 *); diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index 7abea4b808..65a95b5015 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -128,7 +128,7 @@ my %APIs = ( ### Deprecated emem functions (use wmem instead!) # These will become errors once they've been removed from all the - # existing dissectors + # existing code 'emem' => { 'count_errors' => 0, 'functions' => [ 'ep_alloc', 'ep_new', @@ -147,6 +147,7 @@ my %APIs = ( 'ep_stack_push', 'ep_stack_pop', 'ep_stack_peek', + 'ep_address_to_str', 'se_alloc', 'se_new', 'se_alloc0', @@ -157,6 +158,7 @@ my %APIs = ( 'se_strdup_vprintf', 'se_strdup_printf', 'se_alloc_array', + 'se_address_to_str', 'se_tree_create', 'se_tree_insert32', 'se_tree_lookup32', |