aboutsummaryrefslogtreecommitdiffstats
path: root/epan/geoip_db.h
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-01-17 20:34:35 -0500
committerMichael Mann <mmann78@netscape.net>2015-01-18 04:14:03 +0000
commit403be722cee0aa78b6c57b7e61c35d2d59780713 (patch)
treed7798c6683f95a6a6e0a8cb952f4b3165293c17c /epan/geoip_db.h
parent86726f404a60003585d6a5f64f908b091bcac099 (diff)
Remove emem from GeoIP
Change-Id: Ifa96dc38a277b86c28f762489251dcc595afae67 Reviewed-on: https://code.wireshark.org/review/6603 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/geoip_db.h')
-rw-r--r--epan/geoip_db.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/geoip_db.h b/epan/geoip_db.h
index 346b50b602..568a1243aa 100644
--- a/epan/geoip_db.h
+++ b/epan/geoip_db.h
@@ -74,9 +74,9 @@ WS_DLL_PUBLIC int geoip_db_type(guint dbnum);
* @param addr IPv4 address to look up
* @param not_found The string to return if the lookup fails. May be NULL.
*
- * @return The database entry if found, else not_found. Return value must not be freed.
+ * @return The database entry if found, else not_found. Return value must be freed with wmem_free.
*/
-WS_DLL_PUBLIC const char *geoip_db_lookup_ipv4(guint dbnum, guint32 addr, const char *not_found);
+WS_DLL_PUBLIC char *geoip_db_lookup_ipv4(guint dbnum, guint32 addr, const char *not_found);
/**
* Look up an IPv6 address in a database
@@ -85,9 +85,9 @@ WS_DLL_PUBLIC const char *geoip_db_lookup_ipv4(guint dbnum, guint32 addr, const
* @param addr IPv6 address to look up
* @param not_found The string to return if the lookup fails. May be NULL.
*
- * @return The database entry if found, else not_found. Return value must not be freed.
+ * @return The database entry if found, else not_found. Return value must be freed with wmem_free.
*/
-WS_DLL_PUBLIC const char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found);
+WS_DLL_PUBLIC char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found);
/**
* Get all configured paths