mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

114. [cleanup] <isc/sockaddr.h> does not need <isc/buffer.h> or <isc/list.h>.

Browse Source
This commit is contained in:
David Lawrence
2000-04-27 23:29:28 +00:00
parent 1d2f2d7c9a
commit 2cc1d2536d
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
114. [cleanup] <isc/sockaddr.h> does not need <isc/buffer.h> or
<isc/list.h>.
113. [func] Utility programs dig and host added. 113. [func] Utility programs dig and host added.
112. [cleanup] <isc/serial.h> does not need <isc/boolean.h>. 112. [cleanup] <isc/serial.h> does not need <isc/boolean.h>.

6
lib/isc/include/isc/sockaddr.h
View File

@@ -18,14 +18,10 @@
#ifndef ISC_SOCKADDR_H #ifndef ISC_SOCKADDR_H
#define ISC_SOCKADDR_H 1 #define ISC_SOCKADDR_H 1
#include <isc/buffer.h>
#include <isc/net.h> #include <isc/net.h>
#include <isc/list.h>
#include <isc/lang.h> #include <isc/lang.h>
#include <isc/types.h> #include <isc/types.h>
ISC_LANG_BEGINDECLS
struct isc_sockaddr { struct isc_sockaddr {
union { union {
struct sockaddr sa; struct sockaddr sa;
@@ -38,6 +34,8 @@ struct isc_sockaddr {
typedef ISC_LIST(struct isc_sockaddr) isc_sockaddrlist_t; typedef ISC_LIST(struct isc_sockaddr) isc_sockaddrlist_t;
ISC_LANG_BEGINDECLS
isc_boolean_t isc_boolean_t
isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b); isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b);

8
lib/isc/sockaddr.c
View File

@@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <isc/assertions.h> #include <isc/assertions.h>
#include <isc/buffer.h>
#include <isc/error.h> #include <isc/error.h>
#include <isc/netaddr.h> #include <isc/netaddr.h>
#include <isc/region.h> #include <isc/region.h>
@@ -30,8 +31,7 @@
#include <isc/types.h> #include <isc/types.h>
isc_boolean_t isc_boolean_t
isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b) isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b) {
{
REQUIRE(a != NULL && b != NULL); REQUIRE(a != NULL && b != NULL);
if (a->length != b->length) if (a->length != b->length)
@@ -66,13 +66,11 @@ isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b)
return (ISC_TRUE); return (ISC_TRUE);
} }
/* /*
* Compare just the addresses (ignore ports) * Compare just the addresses (ignore ports)
*/ */
isc_boolean_t isc_boolean_t
isc_sockaddr_eqaddr(const isc_sockaddr_t *a, const isc_sockaddr_t *b) isc_sockaddr_eqaddr(const isc_sockaddr_t *a, const isc_sockaddr_t *b) {
{
REQUIRE(a != NULL && b != NULL); REQUIRE(a != NULL && b != NULL);
if (a->length != b->length) if (a->length != b->length)