nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings.

Browse Source 
svn:r14781
This commit is contained in:
Nick Mathewson 2008-05-28 18:34:10 +00:00
parent bd3b86df3b
commit 6641152514
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/geoip.c
View File

@ -348,8 +348,10 @@ geoip_get_client_history(time_t now)
++total;
}
/* Don't record anything if we haven't seen enough IPs. */
#if (MIN_IPS_TO_NOTE_ANYTHING > 0)
if (total < MIN_IPS_TO_NOTE_ANYTHING)
goto done;
#endif
/* Make a list of c_hist_t */
entries = smartlist_create();
for (i = 0; i < n_countries; ++i) {
@ -357,7 +359,11 @@ geoip_get_client_history(time_t now)
const char *countrycode;
c_hist_t *ent;
/* Only report a country if it has a minimum number of IPs. */
#if (MIN_IPS_TO_NOTE_COUNTRY > 0)
if (c >= MIN_IPS_TO_NOTE_COUNTRY) {
#else
if (1) {
#endif
/* Round up to the next multiple of IP_GRANULARITY */
c += IP_GRANULARITY-1;
c -= c % IP_GRANULARITY;
@ -379,7 +385,9 @@ geoip_get_client_history(time_t now)
smartlist_add(chunks, tor_strdup(buf));
});
result = smartlist_join_strings(chunks, ",", 0, NULL);
#if (MIN_IPS_TO_NOTE_ANYTHING > 0)
done:
#endif
tor_free(counts);
if (chunks) {
SMARTLIST_FOREACH(chunks, char *, c, tor_free(c));