mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Get rid of DNS_GEOIP_DATABASE_INIT explicit initializer for geoip dbs

Browse Source 
Instead of the explicit struct initializer with all member, rely on the fact
that static variables are explicitly initialized to 0 if not explicitly
initialized.
This commit is contained in:
Ondřej Surý 2019-07-04 11:17:16 +02:00 committed by Evan Hunt
parent 1957bcaa99
commit a2e89ff0c1
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/named/geoip.c
View File

@ -24,7 +24,7 @@
#include <named/log.h> #include <named/log.h>
#include <named/geoip.h> #include <named/geoip.h>
static dns_geoip_databases_t geoip_table = DNS_GEOIP_DATABASE_INIT; static dns_geoip_databases_t geoip_table;
#if defined(HAVE_GEOIP2) #if defined(HAVE_GEOIP2)
static MMDB_s geoip_country, geoip_city, geoip_as, geoip_isp, geoip_domain; static MMDB_s geoip_country, geoip_city, geoip_as, geoip_isp, geoip_domain;

2
lib/dns/include/dns/geoip.h
View File

@ -92,8 +92,6 @@ struct dns_geoip_databases {
void *domain; /* GeoIP2-Domain */ void *domain; /* GeoIP2-Domain */
void *isp; /* GeoIP2-ISP */ void *isp; /* GeoIP2-ISP */
void *as; /* GeoIP2-ASN or GeoLite2-ASN */ void *as; /* GeoIP2-ASN or GeoLite2-ASN */
#define DNS_GEOIP_DATABASE_INIT \
{ NULL, NULL, NULL, NULL, NULL }
}; };
/*** /***

2
lib/dns/tests/geoip_test.c
View File

@ -38,7 +38,7 @@
/* Use GeoIP2 databases from the 'geoip2' system test */ /* Use GeoIP2 databases from the 'geoip2' system test */
#define TEST_GEOIP_DATA "../../../bin/tests/system/geoip2/data" #define TEST_GEOIP_DATA "../../../bin/tests/system/geoip2/data"
static dns_geoip_databases_t geoip = DNS_GEOIP_DATABASE_INIT; static dns_geoip_databases_t geoip;
static MMDB_s geoip_country, geoip_city, geoip_as, geoip_isp, geoip_domain; static MMDB_s geoip_country, geoip_city, geoip_as, geoip_isp, geoip_domain;