aboutsummaryrefslogtreecommitdiff
path: root/src/or/geoip.c
diff options
context:
space:
mode:
authorLinus Nordberg <linus@torproject.org>2012-10-20 19:35:00 +0200
committerLinus Nordberg <linus@torproject.org>2012-10-20 20:56:59 +0200
commitaf175fa7e4ee3ffd1d91d463ba77a3c10d95c654 (patch)
treee3f9468522b80f7eeca921c8b823b71c0e712bc3 /src/or/geoip.c
parent817ff962f830188ec4c1a907ebc389a856ea3288 (diff)
downloadtor-af175fa7e4ee3ffd1d91d463ba77a3c10d95c654.tar
tor-af175fa7e4ee3ffd1d91d463ba77a3c10d95c654.tar.gz
Duplicate less code.
Diffstat (limited to 'src/or/geoip.c')
-rw-r--r--src/or/geoip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/geoip.c b/src/or/geoip.c
index e1c0009cc..5459b5504 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -326,11 +326,11 @@ init_geoip_countries(void)
* with '#' (comments).
*/
int
-geoip_load_file(sa_family_t family, const char *filename,
- const or_options_t *options)
+geoip_load_file(sa_family_t family, const char *filename)
{
FILE *f;
const char *msg = "";
+ const or_options_t *options = get_options();
int severity = options_need_geoip_info(options, &msg) ? LOG_WARN : LOG_INFO;
crypto_digest_t *geoip_digest_env = NULL;