aboutsummaryrefslogtreecommitdiff
path: root/src/or/geoip.c
diff options
context:
space:
mode:
authorReinaldo de Souza Jr <juniorz@gmail.com>2015-09-07 12:22:33 -0500
committerReinaldo de Souza Jr <juniorz@gmail.com>2015-09-15 11:08:50 -0500
commit4ff08bb5811ddfe554e597d129ec48a774364480 (patch)
treeff8661a350d4d53d1ec3d7d51725453e2295909c /src/or/geoip.c
parenta444b11323799536b4cd7902e29f711b0806293a (diff)
downloadtor-4ff08bb5811ddfe554e597d129ec48a774364480.tar.gz
tor-4ff08bb5811ddfe554e597d129ec48a774364480.zip
Add tests for directory_handle_command_get
Diffstat (limited to 'src/or/geoip.c')
-rw-r--r--src/or/geoip.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 120ce479cc..e04c2484c0 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -18,7 +18,6 @@
#include "geoip.h"
#include "routerlist.h"
-static void clear_geoip_db(void);
static void init_geoip_countries(void);
/** An entry from the GeoIP IPv4 file: maps an IPv4 range to a country. */
@@ -1207,9 +1206,9 @@ geoip_format_dirreq_stats(time_t now)
{
char t[ISO_TIME_LEN+1];
int i;
- char *v3_ips_string, *v3_reqs_string, *v3_direct_dl_string,
- *v3_tunneled_dl_string;
- char *result;
+ char *v3_ips_string = NULL, *v3_reqs_string = NULL,
+ *v3_direct_dl_string = NULL, *v3_tunneled_dl_string = NULL;
+ char *result = NULL;
if (!start_of_dirreq_stats_interval)
return NULL; /* Not initialized. */
@@ -1666,7 +1665,7 @@ getinfo_helper_geoip(control_connection_t *control_conn,
}
/** Release all storage held by the GeoIP databases and country list. */
-static void
+STATIC void
clear_geoip_db(void)
{
if (geoip_countries) {