2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00

update copyright notice / whitespace

This commit is contained in:
Tinderbox User
2014-12-19 23:45:22 +00:00
parent 6ee455a915
commit 055f6517b4
7 changed files with 37 additions and 37 deletions

View File

@@ -374,7 +374,7 @@ dns_rdata_opt_current(dns_rdata_opt_t *opt, dns_rdata_opt_opcode_t *opcode) {
INSIST(opt->offset + 4 <= opt->length); INSIST(opt->offset + 4 <= opt->length);
r.base = opt->options + opt->offset; r.base = opt->options + opt->offset;
r.length = opt->length - opt->offset; r.length = opt->length - opt->offset;
opcode->opcode = uint16_fromregion(&r); opcode->opcode = uint16_fromregion(&r);
isc_region_consume(&r, 2); isc_region_consume(&r, 2);
opcode->length = uint16_fromregion(&r); opcode->length = uint16_fromregion(&r);

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2014 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2001 Internet Software Consortium. * Copyright (C) 1998-2001 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
@@ -21,17 +21,17 @@
/* $Id: spf_99.h,v 1.4 2007/06/19 23:47:17 tbox Exp $ */ /* $Id: spf_99.h,v 1.4 2007/06/19 23:47:17 tbox Exp $ */
typedef struct dns_rdata_spf_string { typedef struct dns_rdata_spf_string {
isc_uint8_t length; isc_uint8_t length;
unsigned char *data; unsigned char *data;
} dns_rdata_spf_string_t; } dns_rdata_spf_string_t;
typedef struct dns_rdata_spf { typedef struct dns_rdata_spf {
dns_rdatacommon_t common; dns_rdatacommon_t common;
isc_mem_t *mctx; isc_mem_t *mctx;
unsigned char *txt; unsigned char *txt;
isc_uint16_t txt_len; isc_uint16_t txt_len;
/* private */ /* private */
isc_uint16_t offset; isc_uint16_t offset;
} dns_rdata_spf_t; } dns_rdata_spf_t;
/* /*

View File

@@ -271,35 +271,35 @@ dns_rdata_txt_next(dns_rdata_txt_t *txt) {
REQUIRE(txt->txt != NULL && txt->txt_len != 0); REQUIRE(txt->txt != NULL && txt->txt_len != 0);
INSIST(txt->offset + 1 <= txt->txt_len); INSIST(txt->offset + 1 <= txt->txt_len);
r.base = txt->txt + txt->offset; r.base = txt->txt + txt->offset;
r.length = txt->txt_len - txt->offset; r.length = txt->txt_len - txt->offset;
length = uint8_fromregion(&r); length = uint8_fromregion(&r);
INSIST(txt->offset + 1 + length <= txt->txt_len); INSIST(txt->offset + 1 + length <= txt->txt_len);
txt->offset = txt->offset + 1 + length; txt->offset = txt->offset + 1 + length;
if (txt->offset == txt->txt_len) if (txt->offset == txt->txt_len)
return (ISC_R_NOMORE); return (ISC_R_NOMORE);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }
isc_result_t isc_result_t
dns_rdata_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string) { dns_rdata_txt_current(dns_rdata_txt_t *txt, dns_rdata_txt_string_t *string) {
isc_region_t r; isc_region_t r;
REQUIRE(txt != NULL); REQUIRE(txt != NULL);
REQUIRE(string != NULL); REQUIRE(string != NULL);
REQUIRE(txt->common.rdtype == 16); REQUIRE(txt->common.rdtype == 16);
REQUIRE(txt->txt != NULL); REQUIRE(txt->txt != NULL);
REQUIRE(txt->offset < txt->txt_len); REQUIRE(txt->offset < txt->txt_len);
INSIST(txt->offset + 1 <= txt->txt_len); INSIST(txt->offset + 1 <= txt->txt_len);
r.base = txt->txt + txt->offset; r.base = txt->txt + txt->offset;
r.length = txt->txt_len - txt->offset; r.length = txt->txt_len - txt->offset;
string->length = uint8_fromregion(&r); string->length = uint8_fromregion(&r);
isc_region_consume(&r, 1); isc_region_consume(&r, 1);
string->data = r.base; string->data = r.base;
INSIST(txt->offset + 1 + string->length <= txt->txt_len); INSIST(txt->offset + 1 + string->length <= txt->txt_len);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }
#endif /* RDATA_GENERIC_TXT_16_C */ #endif /* RDATA_GENERIC_TXT_16_C */

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2009, 2011-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2009, 2011-2014 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

@@ -195,11 +195,11 @@ struct in6_pktinfo {
#ifdef ISC_PLATFORM_HAVESALEN #ifdef ISC_PLATFORM_HAVESALEN
#define _SS_PAD1SIZE (_SS_ALIGNSIZE - (2 * sizeof(isc_uint8_t))) #define _SS_PAD1SIZE (_SS_ALIGNSIZE - (2 * sizeof(isc_uint8_t)))
#define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \ #define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \
+ 2 * sizeof(isc_uint8_t))) + 2 * sizeof(isc_uint8_t)))
#else #else
#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(isc_uint16_t)) #define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(isc_uint16_t))
#define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \ #define _SS_PAD2SIZE (_SS_MAXSIZE - (_SS_ALIGNSIZE + _SS_PAD1SIZE \
+ sizeof(isc_uint16_t))) + sizeof(isc_uint16_t)))
#endif #endif
struct sockaddr_storage { struct sockaddr_storage {

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2007, 2011-2013 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2007, 2011-2014 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium. * Copyright (C) 2000, 2001 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

@@ -1823,7 +1823,7 @@ socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
*socketp = sock; *socketp = sock;
iocompletionport_update(sock); iocompletionport_update(sock);
if (dup_socket) { if (dup_socket) {
#ifndef ISC_ALLOW_MAPPED #ifndef ISC_ALLOW_MAPPED
isc__socket_ipv6only(sock, ISC_TRUE); isc__socket_ipv6only(sock, ISC_TRUE);