diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-04-08 17:52:54 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-04-08 17:52:54 +0000 |
| commit | 7ba7a5de74780dee4ec54bace1ec36427be1d8b8 (patch) | |
| tree | a5a1890b0b884a1d303e90c4130c3b731772abd5 /lib/export/samples | |
| parent | a2bc50f814b6966b412ba90221460066a8b31951 (diff) | |
Notes
Diffstat (limited to 'lib/export/samples')
| -rw-r--r-- | lib/export/samples/nsprobe.c | 12 | ||||
| -rw-r--r-- | lib/export/samples/sample-request.c | 2 | ||||
| -rw-r--r-- | lib/export/samples/sample-update.c | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lib/export/samples/nsprobe.c b/lib/export/samples/nsprobe.c index 795b1ca4fb47..c29c9a679c71 100644 --- a/lib/export/samples/nsprobe.c +++ b/lib/export/samples/nsprobe.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009-2015 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -57,7 +57,7 @@ static isc_appctx_t *actx = NULL; static isc_mem_t *mctx = NULL; static unsigned int outstanding_probes = 0; const char *cacheserver = "127.0.0.1"; -static FILE *fp; +static FILE *input; typedef enum { none, @@ -975,7 +975,7 @@ probe_domain(struct probe_trans *trans) { REQUIRE(outstanding_probes < MAX_PROBES); /* Construct domain */ - cp = fgets(buf, sizeof(buf), fp); + cp = fgets(buf, sizeof(buf), input); if (cp == NULL) return (ISC_R_NOMORE); if ((cp = strchr(buf, '\n')) != NULL) /* zap NL if any */ @@ -1124,10 +1124,10 @@ main(int argc, char *argv[]) { /* Open input file */ if (argc == 0) - fp = stdin; + input = stdin; else { - fp = fopen(argv[0], "r"); - if (fp == NULL) { + input = fopen(argv[0], "r"); + if (input == NULL) { fprintf(stderr, "failed to open input file: %s\n", argv[0]); exit(1); diff --git a/lib/export/samples/sample-request.c b/lib/export/samples/sample-request.c index 8d36a2cebde4..e39c21e8e647 100644 --- a/lib/export/samples/sample-request.c +++ b/lib/export/samples/sample-request.c @@ -213,7 +213,9 @@ main(int argc, char *argv[]) { hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_DGRAM; hints.ai_protocol = IPPROTO_UDP; +#ifdef AI_NUMERICHOST hints.ai_flags = AI_NUMERICHOST; +#endif gai_error = getaddrinfo(argv[0], "53", &hints, &res); if (gai_error != 0) { fprintf(stderr, "getaddrinfo failed: %s\n", diff --git a/lib/export/samples/sample-update.c b/lib/export/samples/sample-update.c index f7e7dcc765e2..acab0059067a 100644 --- a/lib/export/samples/sample-update.c +++ b/lib/export/samples/sample-update.c @@ -181,7 +181,9 @@ main(int argc, char *argv[]) { hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_DGRAM; hints.ai_protocol = IPPROTO_UDP; +#ifdef AI_NUMERICHOST hints.ai_flags = AI_NUMERICHOST; +#endif gai_error = getaddrinfo(auth_server, "53", &hints, &res); if (gai_error != 0) { fprintf(stderr, "getaddrinfo failed: %s\n", @@ -203,7 +205,9 @@ main(int argc, char *argv[]) { hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_DGRAM; hints.ai_protocol = IPPROTO_UDP; +#ifdef AI_NUMERICHOST hints.ai_flags = AI_NUMERICHOST; +#endif gai_error = getaddrinfo(recursive_server, "53", &hints, &res); if (gai_error != 0) { fprintf(stderr, "getaddrinfo failed: %s\n", |