diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-12-26 22:24:15 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-12-26 22:24:15 +0000 |
| commit | ab638bb6fcb5171dcfafea6c17e3e6c464f65e05 (patch) | |
| tree | 6c841c3ad649e007667316f3b618f6cdf8cb7a8a | |
| parent | 5c2a86ebc83ed4d4f517203a227c3d2638661de7 (diff) | |
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
| -rw-r--r-- | epan/geoip_db.c | 5 | ||||
| -rw-r--r-- | epan/geoip_db.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/epan/geoip_db.c b/epan/geoip_db.c index a3de9fd481..5b79b64e5f 100644 --- a/epan/geoip_db.c +++ b/epan/geoip_db.c @@ -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 */ /* diff --git a/epan/geoip_db.h b/epan/geoip_db.h index 753c1a8bf6..908f97897c 100644 --- a/epan/geoip_db.h +++ b/epan/geoip_db.h @@ -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__ */ |