2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 05:28:00 +00:00

update copyright notice / whitespace

This commit is contained in:
Tinderbox User 2015-10-03 23:45:23 +00:00
parent 4a84f8899b
commit 244d11a227
6 changed files with 13 additions and 12 deletions

View File

@ -13,6 +13,7 @@
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* /*
* Portions of this code were adapted from dnstap-ldns: * Portions of this code were adapted from dnstap-ldns:
* *
@ -60,7 +61,7 @@ const char *program = "dnstap-read";
do { result = (op); \ do { result = (op); \
if (result != ISC_R_SUCCESS) { \ if (result != ISC_R_SUCCESS) { \
fprintf(stderr, \ fprintf(stderr, \
"%s: %s: %s\n", program, msg, \ "%s: %s: %s\n", program, msg, \
isc_result_totext(result)); \ isc_result_totext(result)); \
goto cleanup; \ goto cleanup; \
} \ } \

View File

@ -819,7 +819,7 @@ dns_dt_parse(isc_mem_t *mctx, isc_region_t *src, dns_dtdata_t **destp) {
} }
/* Query? */ /* Query? */
if ((d->type & DNS_DTTYPE_QUERY) != 0) if ((d->type & DNS_DTTYPE_QUERY) != 0)
d->query = ISC_TRUE; d->query = ISC_TRUE;
else else
d->query = ISC_FALSE; d->query = ISC_FALSE;
@ -871,10 +871,10 @@ dns_dt_parse(isc_mem_t *mctx, isc_region_t *src, dns_dtdata_t **destp) {
protobuf_c_enum_descriptor_get_value( protobuf_c_enum_descriptor_get_value(
&dnstap__socket_protocol__descriptor, &dnstap__socket_protocol__descriptor,
m->socket_protocol); m->socket_protocol);
if (type != NULL && if (type != NULL &&
type->value == DNSTAP__SOCKET_PROTOCOL__TCP) type->value == DNSTAP__SOCKET_PROTOCOL__TCP)
d->tcp = ISC_TRUE; d->tcp = ISC_TRUE;
else else
d->tcp = ISC_FALSE; d->tcp = ISC_FALSE;
} }
@ -1019,7 +1019,7 @@ dns_dt_datatotext(dns_dtdata_t *d, isc_buffer_t **dest) {
if (d->typebuf[0] == '\0') if (d->typebuf[0] == '\0')
CHECK(putstr(dest, "?")); CHECK(putstr(dest, "?"));
else else
CHECK(putstr(dest, d->typebuf)); CHECK(putstr(dest, d->typebuf));
CHECK(isc_buffer_reserve(dest, 1)); CHECK(isc_buffer_reserve(dest, 1));

View File

@ -141,7 +141,7 @@ dns_dt_create(isc_mem_t *mctx, dns_dtmode_t mode, const char *path,
* *
* Notes: * Notes:
* *
*\li 'path' refers to a UNIX domain socket by default. It may *\li 'path' refers to a UNIX domain socket by default. It may
* optionally be prepended with "socket:" or "file:". If prepended * optionally be prepended with "socket:" or "file:". If prepended
* with "file:", then dnstap logs are sent to a file instead of a * with "file:", then dnstap logs are sent to a file instead of a
* socket. * socket.
@ -235,7 +235,7 @@ dns_dt_send(dns_view_t *view, dns_dtmsgtype_t msgtype,
* *
* Requires: * Requires:
* *
*\li 'view' is a valid view, and 'view->dtenv' is NULL or is a *\li 'view' is a valid view, and 'view->dtenv' is NULL or is a
* valid dnstap environment. * valid dnstap environment.
*/ */
@ -261,7 +261,7 @@ dns_dt_datatotext(dns_dtdata_t *d, isc_buffer_t **dest);
/*%< /*%<
* Converts a parsed dnstap data structure 'd' to text, storing * Converts a parsed dnstap data structure 'd' to text, storing
* the result in the buffer 'dest'. If 'dest' points to a dynamically * the result in the buffer 'dest'. If 'dest' points to a dynamically
* allocated buffer, then it may be reallocated as needed. * allocated buffer, then it may be reallocated as needed.
* *
* (XXX: add a 'long_form' option to generate a detailed listing of * (XXX: add a 'long_form' option to generate a detailed listing of
* dnstap data instead * of a one-line summary.) * dnstap data instead * of a one-line summary.)
@ -324,7 +324,7 @@ dns_dt_getframe(dns_dthandle_t *handle, isc_uint8_t **bufp, size_t *sizep);
*\li 'bufp' is not NULL *\li 'bufp' is not NULL
*\li 'sizep' is not NULL *\li 'sizep' is not NULL
* *
* Ensures: * Ensures:
* \li if returning ISC_R_SUCCESS then '*bufp' is not NULL * \li if returning ISC_R_SUCCESS then '*bufp' is not NULL
* *
* Returns: * Returns:

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2008, 2011, 2013, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008, 2011, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium. * Copyright (C) 1999-2002 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2011, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007, 2009-2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007, 2009-2015 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2001, 2003 Internet Software Consortium. * Copyright (C) 1998-2001, 2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any