diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/asr/asr.c | 10 | ||||
| -rw-r--r-- | lib/libc/asr/asr_debug.c | 4 | ||||
| -rw-r--r-- | lib/libc/asr/asr_private.h | 20 |
3 files changed, 17 insertions, 17 deletions
diff --git a/lib/libc/asr/asr.c b/lib/libc/asr/asr.c index 68d63c38d00..8d5300a2f61 100644 --- a/lib/libc/asr/asr.c +++ b/lib/libc/asr/asr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asr.c,v 1.43 2015/09/20 14:19:21 eric Exp $ */ +/* $OpenBSD: asr.c,v 1.44 2015/10/03 09:57:30 eric Exp $ */ /* * Copyright (c) 2010-2012 Eric Faurot <eric@openbsd.org> * @@ -94,7 +94,7 @@ _asr_resolver(const char *conf) if (init == 0) { #ifdef DEBUG if (getenv("ASR_DEBUG")) - asr_debug = stderr; + _asr_debug = stderr; #endif init = 1; } @@ -135,7 +135,7 @@ _asr_resolver(const char *conf) } #ifdef DEBUG - asr_dump_config(asr_debug, asr); + _asr_dump_config(_asr_debug, asr); #endif return (asr); @@ -193,10 +193,10 @@ asr_run(struct asr_query *as, struct asr_result *ar) int r, saved_errno = errno; DPRINT("asr: asr_run(%p, %p) %s ctx=[%p]\n", as, ar, - asr_querystr(as->as_type), as->as_ctx); + _asr_querystr(as->as_type), as->as_ctx); r = as->as_run(as, ar); - DPRINT("asr: asr_run(%p, %p) -> %s", as, ar, asr_transitionstr(r)); + DPRINT("asr: asr_run(%p, %p) -> %s", as, ar, _asr_transitionstr(r)); #ifdef DEBUG if (r == ASYNC_COND) #endif diff --git a/lib/libc/asr/asr_debug.c b/lib/libc/asr/asr_debug.c index 527b2b55606..bcd0525efa1 100644 --- a/lib/libc/asr/asr_debug.c +++ b/lib/libc/asr/asr_debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asr_debug.c,v 1.20 2015/09/09 15:49:34 deraadt Exp $ */ +/* $OpenBSD: asr_debug.c,v 1.21 2015/10/03 09:57:30 eric Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * @@ -33,7 +33,7 @@ static const char *print_header(const struct asr_dns_header *, char *, size_t); static const char *print_query(const struct asr_dns_query *, char *, size_t); static const char *print_rr(const struct asr_dns_rr *, char *, size_t); -FILE *asr_debug = NULL; +FILE *_asr_debug = NULL; #define OPCODE_SHIFT 11 #define Z_SHIFT 4 diff --git a/lib/libc/asr/asr_private.h b/lib/libc/asr/asr_private.h index 13effd7f134..df6604ba0aa 100644 --- a/lib/libc/asr/asr_private.h +++ b/lib/libc/asr/asr_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asr_private.h,v 1.32 2015/09/09 15:49:34 deraadt Exp $ */ +/* $OpenBSD: asr_private.h,v 1.33 2015/10/03 09:57:30 eric Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * @@ -334,13 +334,13 @@ int _asr_iter_domain(struct asr_query *, const char *, char *, size_t); #ifdef DEBUG -#define DPRINT(...) do { if(asr_debug) { \ - fprintf(asr_debug, __VA_ARGS__); \ +#define DPRINT(...) do { if(_asr_debug) { \ + fprintf(_asr_debug, __VA_ARGS__); \ } } while (0) -#define DPRINT_PACKET(n, p, s) do { if(asr_debug) { \ - fprintf(asr_debug, "----- %s -----\n", n); \ - asr_dump_packet(asr_debug, (p), (s)); \ - fprintf(asr_debug, "--------------\n"); \ +#define DPRINT_PACKET(n, p, s) do { if(_asr_debug) { \ + fprintf(_asr_debug, "----- %s -----\n", n); \ + _asr_dump_packet(_asr_debug, (p), (s)); \ + fprintf(_asr_debug, "--------------\n"); \ } } while (0) const char *_asr_querystr(int); @@ -361,10 +361,10 @@ extern FILE *_asr_debug; #define async_set_state(a, s) do { \ DPRINT("asr: [%s@%p] %s -> %s\n", \ - asr_querystr((a)->as_type), \ + _asr_querystr((a)->as_type), \ as, \ - asr_statestr((a)->as_state), \ - asr_statestr((s))); \ + _asr_statestr((a)->as_state), \ + _asr_statestr((s))); \ (a)->as_state = (s); } while (0) __END_HIDDEN_DECLS |