interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make internal types POSIX-compliant by not naming them *_t. 

See: http://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_xsh_chap02.html#tag_22_02_12_01

The change tacitly ignores the colossal number of coach and horses the entire world, including getdns, has stampeded through this POSIX hope for decades, but simply hopes for some small recognition when the Recording Angel tots up the damages.
This commit is contained in:
Jim Hague 2018-01-17 15:35:56 +00:00
parent 6bd0f8b980
commit 760269acbd
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/tools/getdns_server_mon.c
View File

@ -63,7 +63,7 @@ typedef enum {
EXIT_CRITICAL, EXIT_CRITICAL,
EXIT_UNKNOWN, EXIT_UNKNOWN,
EXIT_USAGE /* Special case - internal only. */ EXIT_USAGE /* Special case - internal only. */
} exit_value_t; } exit_value;
/* Plugin verbosity values */ /* Plugin verbosity values */
typedef enum { typedef enum {
@ -71,7 +71,7 @@ typedef enum {
VERBOSITY_ADDITIONAL, VERBOSITY_ADDITIONAL,
VERBOSITY_CONFIG, VERBOSITY_CONFIG,
VERBOSITY_DEBUG VERBOSITY_DEBUG
} verbosity_t; } plugin_verbosity;
static struct test_info_s static struct test_info_s
{ {
@ -80,7 +80,7 @@ static struct test_info_s
/* Output control */ /* Output control */
bool monitoring; bool monitoring;
FILE *errout; FILE *errout;
verbosity_t verbosity; plugin_verbosity verbosity;
/* Test config info */ /* Test config info */
bool fail_on_dns_errors; bool fail_on_dns_errors;
@ -260,7 +260,7 @@ static void get_thresholds(char ***av,
return; return;
} }
static exit_value_t get_name_type_args(const struct test_info_s *test_info, static exit_value get_name_type_args(const struct test_info_s *test_info,
char ***av, char ***av,
const char **lookup_name, const char **lookup_name,
uint32_t *lookup_type) uint32_t *lookup_type)
@ -286,7 +286,7 @@ static exit_value_t get_name_type_args(const struct test_info_s *test_info,
return EXIT_OK; return EXIT_OK;
} }
static exit_value_t search(const struct test_info_s *test_info, static exit_value search(const struct test_info_s *test_info,
const char *name, const char *name,
uint16_t type, uint16_t type,
getdns_dict **response) getdns_dict **response)
@ -333,7 +333,7 @@ static exit_value_t search(const struct test_info_s *test_info,
return EXIT_OK; return EXIT_OK;
} }
static exit_value_t check_result(const struct test_info_s *test_info, static exit_value check_result(const struct test_info_s *test_info,
const getdns_dict *response) const getdns_dict *response)
{ {
getdns_return_t ret; getdns_return_t ret;
@ -383,7 +383,7 @@ static exit_value_t check_result(const struct test_info_s *test_info,
return EXIT_OK; return EXIT_OK;
} }
static exit_value_t get_report_info(const struct test_info_s *test_info, static exit_value get_report_info(const struct test_info_s *test_info,
const getdns_dict *response, const getdns_dict *response,
uint32_t *rtt, uint32_t *rtt,
getdns_bindata **auth_status, getdns_bindata **auth_status,
@ -478,7 +478,7 @@ static exit_value_t get_report_info(const struct test_info_s *test_info,
return EXIT_OK; return EXIT_OK;
} }
static exit_value_t get_answers(const struct test_info_s *test_info, static exit_value get_answers(const struct test_info_s *test_info,
const getdns_dict *response, const getdns_dict *response,
const char *section, const char *section,
getdns_list **answers, getdns_list **answers,
@ -516,13 +516,13 @@ static exit_value_t get_answers(const struct test_info_s *test_info,
return EXIT_OK; return EXIT_OK;
} }
static exit_value_t check_answer_type(const struct test_info_s *test_info, static exit_value check_answer_type(const struct test_info_s *test_info,
const getdns_dict *response, const getdns_dict *response,
uint32_t rrtype) uint32_t rrtype)
{ {
getdns_list *answers; getdns_list *answers;
size_t no_answers; size_t no_answers;
exit_value_t xit; exit_value xit;
if ((xit = get_answers(test_info, response, "answer", &answers, &no_answers)) != EXIT_OK) if ((xit = get_answers(test_info, response, "answer", &answers, &no_answers)) != EXIT_OK)
return xit; return xit;
@ -557,7 +557,7 @@ static exit_value_t check_answer_type(const struct test_info_s *test_info,
return EXIT_UNKNOWN; return EXIT_UNKNOWN;
} }
static exit_value_t search_check(const struct test_info_s *test_info, static exit_value search_check(const struct test_info_s *test_info,
const char *lookup_name, const char *lookup_name,
uint16_t lookup_type, uint16_t lookup_type,
getdns_dict **response, getdns_dict **response,
@ -565,7 +565,7 @@ static exit_value_t search_check(const struct test_info_s *test_info,
getdns_bindata **auth_status, getdns_bindata **auth_status,
time_t *cert_expire_time) time_t *cert_expire_time)
{ {
exit_value_t xit; exit_value xit;
getdns_dict *resp; getdns_dict *resp;
if ((xit = search(test_info, lookup_name, lookup_type, &resp)) != EXIT_OK) if ((xit = search(test_info, lookup_name, lookup_type, &resp)) != EXIT_OK)
@ -585,7 +585,7 @@ static exit_value_t search_check(const struct test_info_s *test_info,
return xit; return xit;
} }
static exit_value_t parse_search_check(const struct test_info_s *test_info, static exit_value parse_search_check(const struct test_info_s *test_info,
char **av, char **av,
const char *usage, const char *usage,
getdns_dict **response, getdns_dict **response,
@ -595,7 +595,7 @@ static exit_value_t parse_search_check(const struct test_info_s *test_info,
{ {
const char *lookup_name = DEFAULT_LOOKUP_NAME; const char *lookup_name = DEFAULT_LOOKUP_NAME;
uint32_t lookup_type = DEFAULT_LOOKUP_TYPE; uint32_t lookup_type = DEFAULT_LOOKUP_TYPE;
exit_value_t xit; exit_value xit;
if ((xit = get_name_type_args(test_info, &av, &lookup_name, &lookup_type)) != EXIT_OK) if ((xit = get_name_type_args(test_info, &av, &lookup_name, &lookup_type)) != EXIT_OK)
return xit; return xit;
@ -615,10 +615,10 @@ static exit_value_t parse_search_check(const struct test_info_s *test_info,
** Test routines. ** Test routines.
**/ **/
static exit_value_t test_lookup(const struct test_info_s *test_info, static exit_value test_lookup(const struct test_info_s *test_info,
char ** av) char ** av)
{ {
exit_value_t xit; exit_value xit;
if ((xit = parse_search_check(test_info, if ((xit = parse_search_check(test_info,
av, av,
@ -633,10 +633,10 @@ static exit_value_t test_lookup(const struct test_info_s *test_info,
return EXIT_OK; return EXIT_OK;
} }
static exit_value_t test_rtt(const struct test_info_s *test_info, static exit_value test_rtt(const struct test_info_s *test_info,
char ** av) char ** av)
{ {
exit_value_t xit; exit_value xit;
int critical_ms = RTT_CRITICAL_MS; int critical_ms = RTT_CRITICAL_MS;
int warning_ms = RTT_WARNING_MS; int warning_ms = RTT_WARNING_MS;
uint32_t rtt_val; uint32_t rtt_val;
@ -661,10 +661,10 @@ static exit_value_t test_rtt(const struct test_info_s *test_info,
return EXIT_OK; return EXIT_OK;
} }
static exit_value_t test_authenticate(const struct test_info_s *test_info, static exit_value test_authenticate(const struct test_info_s *test_info,
char ** av) char ** av)
{ {
exit_value_t xit; exit_value xit;
getdns_bindata *auth_status; getdns_bindata *auth_status;
if ((xit = parse_search_check(test_info, if ((xit = parse_search_check(test_info,
@ -685,10 +685,10 @@ static exit_value_t test_authenticate(const struct test_info_s *test_info,
} }
} }
static exit_value_t test_certificate_valid(const struct test_info_s *test_info, static exit_value test_certificate_valid(const struct test_info_s *test_info,
char **av) char **av)
{ {
exit_value_t xit; exit_value xit;
int warning_days = CERT_EXPIRY_WARNING_DAYS; int warning_days = CERT_EXPIRY_WARNING_DAYS;
int critical_days = CERT_EXPIRY_CRITICAL_DAYS; int critical_days = CERT_EXPIRY_CRITICAL_DAYS;
time_t expire_time; time_t expire_time;
@ -737,7 +737,7 @@ static exit_value_t test_certificate_valid(const struct test_info_s *test_info,
return EXIT_OK; return EXIT_OK;
} }
static exit_value_t test_qname_minimisation(const struct test_info_s *test_info, static exit_value test_qname_minimisation(const struct test_info_s *test_info,
char ** av) char ** av)
{ {
if (*av) { if (*av) {
@ -747,7 +747,7 @@ static exit_value_t test_qname_minimisation(const struct test_info_s *test_info,
} }
getdns_dict *response; getdns_dict *response;
exit_value_t xit; exit_value xit;
if ((xit = search_check(test_info, if ((xit = search_check(test_info,
"qnamemintest.internet.nl", "qnamemintest.internet.nl",
@ -817,11 +817,11 @@ static exit_value_t test_qname_minimisation(const struct test_info_s *test_info,
return EXIT_UNKNOWN; return EXIT_UNKNOWN;
} }
static exit_value_t test_padding(const struct test_info_s *test_info, static exit_value test_padding(const struct test_info_s *test_info,
char ** av) char ** av)
{ {
getdns_dict *response; getdns_dict *response;
exit_value_t xit; exit_value xit;
long blocksize; long blocksize;
char *endptr; char *endptr;
const char USAGE[] = "padding takes arguments <blocksize> [<name> [<type>]]"; const char USAGE[] = "padding takes arguments <blocksize> [<name> [<type>]]";
@ -941,11 +941,11 @@ no_padding:
return EXIT_CRITICAL; return EXIT_CRITICAL;
} }
static exit_value_t test_keepalive(const struct test_info_s *test_info, static exit_value test_keepalive(const struct test_info_s *test_info,
char ** av) char ** av)
{ {
getdns_dict *response; getdns_dict *response;
exit_value_t xit; exit_value xit;
long long timeout; long long timeout;
char *endptr; char *endptr;
const char USAGE[] = "keepalive takes arguments <timeout-ms> [<name> [<type>]]"; const char USAGE[] = "keepalive takes arguments <timeout-ms> [<name> [<type>]]";
@ -1033,7 +1033,7 @@ static struct test_funcs_s
const char *name; const char *name;
bool implies_tls; bool implies_tls;
bool implies_tcp; bool implies_tcp;
exit_value_t (*func)(const struct test_info_s *test_info, char **av); exit_value (*func)(const struct test_info_s *test_info, char **av);
} TESTS[] = } TESTS[] =
{ {
{ "lookup", false, false, test_lookup }, { "lookup", false, false, test_lookup },
@ -1281,7 +1281,7 @@ int main(int ac, char *av[])
} }
} }
exit_value_t xit = f->func(&test_info, av); exit_value xit = f->func(&test_info, av);
switch(xit) { switch(xit) {
case EXIT_OK: case EXIT_OK:
fputs(" (OK)", test_info.errout); fputs(" (OK)", test_info.errout);