osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

geoip_db_get_paths() is exported from libwireshark, so it has to exist 

regardless of whether we have GeoIP or not.  However, regardless of
whether it's exported from GeoIP or not, it should return a g_mallocated
string.

svn path=/trunk/; revision=46798
This commit is contained in:
Guy Harris 2012-12-26 22:24:15 +00:00
parent 5c2a86ebc8
commit ab638bb6fc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/geoip_db.c
View File

@ -596,6 +596,11 @@ geoip_db_lookup_ipv6(guint dbnum _U_, guint32 addr _U_, const char *not_found) {
return not_found;
}
gchar *
geoip_db_get_paths(void) {
return g_strdup("");
}
#endif /* HAVE_GEOIP */
/*

4
epan/geoip_db.h
View File

@ -84,8 +84,6 @@ extern const char *geoip_db_lookup_ipv4(guint dbnum, guint32 addr, const char *n
*/
extern const char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found);
#ifdef HAVE_GEOIP
/**
* Get all configured paths
*
@ -93,6 +91,4 @@ extern const char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, con
*/
extern gchar *geoip_db_get_paths(void);
#endif /* HAVE_GEOIP */
#endif /* __GEOIP_DB_H__ */