Drop unused bufferlist code

diff --git a/bin/dig/dighost.h b/bin/dig/dighost.h
index bc280e540e9a74cf6f2c2647844eb9cef6a5e418..d27e40481d24ce06e664c68ff2d94790a89cc298 100644 (file)
--- a/bin/dig/dighost.h
+++ b/bin/dig/dighost.h
@@ -19,7 +19,6 @@
 
 #include <isc/attributes.h>
 #include <isc/buffer.h>
-#include <isc/bufferlist.h>
 #include <isc/formatcheck.h>
 #include <isc/lang.h>
 #include <isc/list.h>

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index c6b63a410bef4300e025f79ed82a79e7c3c62fe9..717da02e5612a366ccafca9b67db9a892768e813 100644 (file)
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -15,7 +15,6 @@ libisc_la_HEADERS =                   \
        include/isc/base64.h            \
        include/isc/bind9.h             \
        include/isc/buffer.h            \
-       include/isc/bufferlist.h        \
        include/isc/cmocka.h            \
        include/isc/commandline.h       \
        include/isc/counter.h           \
@@ -159,7 +158,6 @@ libisc_la_SOURCES =         \
        base64.c                \
        bind9.c                 \
        buffer.c                \
-       bufferlist.c            \
        commandline.c           \
        counter.c               \
        crc64.c                 \

diff --git a/lib/isc/bufferlist.c b/lib/isc/bufferlist.c
deleted file mode 100644 (file)
index 8393d1d..0000000
--- a/lib/isc/bufferlist.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-/*! \file */
-
-#include <stddef.h>
-
-#include <isc/buffer.h>
-#include <isc/bufferlist.h>
-#include <isc/util.h>
-
-unsigned int
-isc_bufferlist_usedcount(isc_bufferlist_t *bl) {
-       isc_buffer_t *buffer;
-       unsigned int length;
-
-       REQUIRE(bl != NULL);
-
-       length = 0;
-       buffer = ISC_LIST_HEAD(*bl);
-       while (buffer != NULL) {
-               REQUIRE(ISC_BUFFER_VALID(buffer));
-               length += isc_buffer_usedlength(buffer);
-               buffer = ISC_LIST_NEXT(buffer, link);
-       }
-
-       return (length);
-}
-
-unsigned int
-isc_bufferlist_availablecount(isc_bufferlist_t *bl) {
-       isc_buffer_t *buffer;
-       unsigned int length;
-
-       REQUIRE(bl != NULL);
-
-       length = 0;
-       buffer = ISC_LIST_HEAD(*bl);
-       while (buffer != NULL) {
-               REQUIRE(ISC_BUFFER_VALID(buffer));
-               length += isc_buffer_availablelength(buffer);
-               buffer = ISC_LIST_NEXT(buffer, link);
-       }
-
-       return (length);
-}

diff --git a/lib/isc/include/isc/bufferlist.h b/lib/isc/include/isc/bufferlist.h
deleted file mode 100644 (file)
index 8fe6e36..0000000
--- a/lib/isc/include/isc/bufferlist.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#ifndef ISC_BUFFERLIST_H
-#define ISC_BUFFERLIST_H 1
-
-/*****
-***** Module Info
-*****/
-
-/*! \file isc/bufferlist.h
- *
- *
- *\brief       Buffer lists have no synchronization.  Clients must ensure
- * exclusive * access.
- *
- * \li Reliability:
- *     No anticipated impact.
- *
- * \li Security:
- *     No anticipated impact.
- *
- * \li Standards:
- *     None.
- */
-
-/***
- *** Imports
- ***/
-
-#include <isc/lang.h>
-#include <isc/types.h>
-
-ISC_LANG_BEGINDECLS
-
-/***
- *** Functions
- ***/
-
-unsigned int
-isc_bufferlist_usedcount(isc_bufferlist_t *bl);
-/*!<
- * \brief Return the length of the sum of all used regions of all buffers in
- * the buffer list 'bl'
- *
- * Requires:
- *
- *\li  'bl' is not NULL.
- *
- * Returns:
- *\li  sum of all used regions' lengths.
- */
-
-unsigned int
-isc_bufferlist_availablecount(isc_bufferlist_t *bl);
-/*!<
- * \brief Return the length of the sum of all available regions of all buffers
- * in the buffer list 'bl'
- *
- * Requires:
- *
- *\li  'bl' is not NULL.
- *
- * Returns:
- *\li  sum of all available regions' lengths.
- */
-
-ISC_LANG_ENDDECLS
-
-#endif /* ISC_BUFFERLIST_H */

diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in
index 8c2ba39c904c6c65bbc4cd6ddac66555d5acb48e..6ce39f6fef255c52187eb271ee0554f1177222cf 100644 (file)
--- a/lib/isc/win32/libisc.def.in
+++ b/lib/isc/win32/libisc.def.in
@@ -161,8 +161,6 @@ isc_buffer_putdecint
 isc_buffer_reinit
 isc_buffer_reserve
 isc_buffer_setautorealloc
-isc_bufferlist_availablecount
-isc_bufferlist_usedcount
 isc_commandline_parse
 isc_commandline_strtoargv
 isc_condition_broadcast

diff --git a/lib/isc/win32/libisc.vcxproj.filters.in b/lib/isc/win32/libisc.vcxproj.filters.in
index 80f17237d74d3d53ed9e897463e00bac4f5a3505..216be2f3a31da2524ed74f4a996800694355b2e4 100644 (file)
--- a/lib/isc/win32/libisc.vcxproj.filters.in
+++ b/lib/isc/win32/libisc.vcxproj.filters.in
@@ -59,9 +59,6 @@
     <ClInclude Include="..\include\isc\buffer.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\isc\bufferlist.h">
-      <Filter>Library Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\isc\commandline.h">
       <Filter>Library Header Files</Filter>
     </ClInclude>
@@ -470,9 +467,6 @@
     <ClCompile Include="..\buffer.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\bufferlist.c">
-      <Filter>Library Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\commandline.c">
       <Filter>Library Source Files</Filter>
     </ClCompile>

diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in
index 17d292fb469fb76e518831a9fb9198c96a7ff1b6..9da70435f0f150b53ae8ca5ad87c847a0b68595a 100644 (file)
--- a/lib/isc/win32/libisc.vcxproj.in
+++ b/lib/isc/win32/libisc.vcxproj.in
@@ -266,7 +266,6 @@ copy InstallFiles ..\Build\Release\
     <ClInclude Include="..\include\isc\bind9.h" />
     <ClInclude Include="..\include\isc\boolean.h" />
     <ClInclude Include="..\include\isc\buffer.h" />
-    <ClInclude Include="..\include\isc\bufferlist.h" />
     <ClInclude Include="..\include\isc\commandline.h" />
     <ClInclude Include="..\include\isc\counter.h" />
     <ClInclude Include="..\include\isc\crc64.h" />
@@ -383,7 +382,6 @@ copy InstallFiles ..\Build\Release\
     <ClCompile Include="..\base64.c" />
     <ClCompile Include="..\bind9.c" />
     <ClCompile Include="..\buffer.c" />
-    <ClCompile Include="..\bufferlist.c" />
     <ClCompile Include="..\commandline.c" />
     <ClCompile Include="..\counter.c" />
     <ClCompile Include="..\crc64.c" />

diff --git a/util/copyrights b/util/copyrights
index d9a4420a340feb22aaa965d98fb3334cc777b878..20d0240542eadc6c49928a0618e3b92f82d4e030 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1759,7 +1759,6 @@
 ./lib/isc/base64.c                             C       1998,1999,2000,2001,2003,2004,2005,2007,2009,2013,2014,2015,2016,2018,2019,2020
 ./lib/isc/bind9.c                              C       2013,2016,2018,2019,2020
 ./lib/isc/buffer.c                             C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2012,2014,2015,2016,2017,2018,2019,2020
-./lib/isc/bufferlist.c                         C       1999,2000,2001,2004,2005,2007,2016,2018,2019,2020
 ./lib/isc/commandline.c                                C.PORTION       1999,2000,2001,2004,2005,2007,2008,2014,2015,2016,2018,2019,2020
 ./lib/isc/counter.c                            C       2014,2016,2018,2019,2020
 ./lib/isc/crc64.c                              C       2013,2016,2018,2019,2020
@@ -1788,7 +1787,6 @@
 ./lib/isc/include/isc/base64.h                 C       1999,2000,2001,2004,2005,2006,2007,2016,2018,2019,2020
 ./lib/isc/include/isc/bind9.h                  C       2009,2013,2016,2018,2019,2020
 ./lib/isc/include/isc/buffer.h                 C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2010,2012,2014,2016,2017,2018,2019,2020
-./lib/isc/include/isc/bufferlist.h             C       1999,2000,2001,2004,2005,2006,2007,2016,2018,2019,2020
 ./lib/isc/include/isc/cmocka.h                 C       2020
 ./lib/isc/include/isc/commandline.h            C       1999,2000,2001,2004,2005,2006,2007,2015,2016,2018,2019,2020
 ./lib/isc/include/isc/counter.h                        C       2014,2016,2018,2019,2020