summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrei Pavel <andrei@isc.org>2024-03-04 11:19:56 +0100
committerAndrei Pavel <andrei@isc.org>2024-03-21 17:30:04 +0100
commit34bf4c91032fdcc67965c4d1de1aa9af3bf94c06 (patch)
treeb7c8735c3d1eeae8b1d92c56723365dd7a9104d0 /src
parent[#3210] miscellaneous warning fixes in lib/util (diff)
downloadkea-34bf4c91032fdcc67965c4d1de1aa9af3bf94c06.tar.xz
kea-34bf4c91032fdcc67965c4d1de1aa9af3bf94c06.zip
[#3210] update copyright dates
Diffstat (limited to 'src')
-rw-r--r--src/lib/dhcp/duid.cc2
-rw-r--r--src/lib/dhcp/option_vendor.h2
-rw-r--r--src/lib/dhcpsrv/lease.cc2
-rw-r--r--src/lib/dhcpsrv/parsers/base_network_parser.cc2
-rw-r--r--src/lib/tcp/tcp_connection.cc2
-rw-r--r--src/lib/tcp/tcp_stream_msg.cc2
-rw-r--r--src/lib/util/str.h106
-rw-r--r--src/lib/util/tests/Makefile.am38
-rw-r--r--src/lib/util/tests/run_unittests.cc16
9 files changed, 86 insertions, 86 deletions
diff --git a/src/lib/dhcp/duid.cc b/src/lib/dhcp/duid.cc
index ef7a62a0ea..1b1728958d 100644
--- a/src/lib/dhcp/duid.cc
+++ b/src/lib/dhcp/duid.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 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
diff --git a/src/lib/dhcp/option_vendor.h b/src/lib/dhcp/option_vendor.h
index 2de6f37e25..4ba124a1ab 100644
--- a/src/lib/dhcp/option_vendor.h
+++ b/src/lib/dhcp/option_vendor.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2024 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
diff --git a/src/lib/dhcpsrv/lease.cc b/src/lib/dhcpsrv/lease.cc
index 651b9f58b7..2ea916794d 100644
--- a/src/lib/dhcpsrv/lease.cc
+++ b/src/lib/dhcpsrv/lease.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 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
diff --git a/src/lib/dhcpsrv/parsers/base_network_parser.cc b/src/lib/dhcpsrv/parsers/base_network_parser.cc
index c70c44d36a..6f0ab84efc 100644
--- a/src/lib/dhcpsrv/parsers/base_network_parser.cc
+++ b/src/lib/dhcpsrv/parsers/base_network_parser.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-2024 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
diff --git a/src/lib/tcp/tcp_connection.cc b/src/lib/tcp/tcp_connection.cc
index a3fa375bfd..0cd3cab51a 100644
--- a/src/lib/tcp/tcp_connection.cc
+++ b/src/lib/tcp/tcp_connection.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-2024 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
diff --git a/src/lib/tcp/tcp_stream_msg.cc b/src/lib/tcp/tcp_stream_msg.cc
index 64332af840..439ac8382d 100644
--- a/src/lib/tcp/tcp_stream_msg.cc
+++ b/src/lib/tcp/tcp_stream_msg.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-2024 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
diff --git a/src/lib/util/str.h b/src/lib/util/str.h
index 220b5417df..1e5d4c405f 100644
--- a/src/lib/util/str.h
+++ b/src/lib/util/str.h
@@ -1,30 +1,30 @@
// Copyright (C) 2011-2024 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 http://mozilla.org/MPL/2.0/.
-
+
#ifndef KEA_UTIL_STR_H
#define KEA_UTIL_STR_H
#include <exceptions/exceptions.h>
-
-#include <algorithm>
+
+#include <algorithm>
#include <cstddef>
#include <cstdint>
#include <memory>
#include <sstream>
#include <string>
-#include <vector>
+#include <vector>
#include <boost/lexical_cast.hpp>
-
-namespace isc {
-namespace util {
-namespace str {
-
+
+namespace isc {
+namespace util {
+namespace str {
+
/// @brief A Set of C++ Utilities for Manipulating Strings
-
+
///
/// @brief A standard string util exception that is thrown if getToken or
/// numToToken are called with bad input data
@@ -36,16 +36,16 @@ public:
};
/// @brief Trim leading and trailing spaces.
-///
-/// Returns a copy of the input string but with any leading or trailing spaces
-/// or tabs removed.
-///
+///
+/// Returns a copy of the input string but with any leading or trailing spaces
+/// or tabs removed.
+///
/// @param input Input string to modify.
-///
+///
/// @return String with leading and trailing spaces removed.
std::string
trim(const std::string& input);
-
+
/// @brief Finds the "trimmed" end of a buffer
///
/// Works backward from the end of the buffer, looking for the first
@@ -68,71 +68,71 @@ seekTrimmed(Iterator const& begin, Iterator end, uint8_t const trim_val) {
}
return (end);
}
-
+
/// @brief Split string into tokens.
-///
-/// Splits a string into tokens (the tokens being delimited by one or more of
+///
+/// Splits a string into tokens (the tokens being delimited by one or more of
/// the delimiter characters) and returns the tokens in a vector.
/// Adjacent delimiters are considered to be a single delimiter.
-///
-/// Special cases are:
-/// -# The empty string is considered to be zero tokens.
-/// -# A string comprising nothing but delimiters is considered to be zero
-/// tokens.
-///
-/// The reasoning behind this is that the string can be thought of as having
-/// invisible leading and trailing delimiter characters. Therefore both cases
-/// reduce to a set of contiguous delimiters, which are considered a single
-/// delimiter (so getting rid of the string).
+///
+/// Special cases are:
+/// -# The empty string is considered to be zero tokens.
+/// -# A string comprising nothing but delimiters is considered to be zero
+/// tokens.
+///
+/// The reasoning behind this is that the string can be thought of as having
+/// invisible leading and trailing delimiter characters. Therefore both cases
+/// reduce to a set of contiguous delimiters, which are considered a single
+/// delimiter (so getting rid of the string).
/// Optional escape allows to escape delimiter characters (and *only* them
/// and the escape character itself) using backslash.
-///
-/// We could use Boost for this, but this (simple) function eliminates one
-/// dependency in the code.
-///
+///
+/// We could use Boost for this, but this (simple) function eliminates one
+/// dependency in the code.
+///
/// @param text String to be split. Passed by value as the internal copy is
-/// altered during the processing.
+/// altered during the processing.
/// @param delim Delimiter characters
/// @param escape Use backslash to escape delimiter characters
-///
+///
/// @return Vector of tokens.
std::vector<std::string>
tokens(const std::string& text, const std::string& delim = " \t\n", bool escape = false);
-
+
/// @brief Convert character to uppercase.
-///
+///
/// Used in uppercase() to pass as a parameter to std::transform(). The
/// function std::toupper() can't be used as it takes an "int" as its parameter;
-/// this confuses the template expansion mechanism because dereferencing a
-/// string::iterator returns a char.
-///
+/// this confuses the template expansion mechanism because dereferencing a
+/// string::iterator returns a char.
+///
/// @param chr Character to be upper-cased.
-///
+///
/// @return Uppercase version of the input character.
char
toUpper(char const chr);
-
+
/// @brief Convert string to uppercase.
-///
+///
/// @param text String to be upper-cased.
void
uppercase(std::string& text);
-
+
/// @brief Convert character to lowercase.
-///
+///
/// Used in lowercase() to pass as a parameter to std::transform(). The
/// function std::tolower() can't be used as it takes an "int" as its parameter;
-/// this confuses the template expansion mechanism because dereferencing a
-/// string::iterator returns a char.
-///
+/// this confuses the template expansion mechanism because dereferencing a
+/// string::iterator returns a char.
+///
/// @param chr Character to be lower-cased.
-///
+///
/// @return Lowercase version of the input character.
char
toLower(char const chr);
-
+
/// @brief Convert string to lowercase.
-///
+///
/// @param text String to be lower-cased.
void
lowercase(std::string& text);
@@ -288,5 +288,5 @@ dumpAsHex(const uint8_t* data, size_t length);
} // namespace str
} // namespace util
} // namespace isc
-
+
#endif // KEA_UTIL_STR_H
diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am
index 050a3d38d3..430c53db91 100644
--- a/src/lib/util/tests/Makefile.am
+++ b/src/lib/util/tests/Makefile.am
@@ -1,29 +1,29 @@
-SUBDIRS = .
-
+SUBDIRS = .
+
AM_CPPFLAGS =
AM_CPPFLAGS += -DABS_SRCDIR=\"$(abs_srcdir)\"
AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_builddir)\"
AM_CPPFLAGS += -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(KEA_CXXFLAGS)
-
-if USE_STATIC_LINK
-AM_LDFLAGS = -static
-endif
-
-CLEANFILES = *.gcno *.gcda
+
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
+CLEANFILES = *.gcno *.gcda
# CSV files are created by unit tests for CSVFile class.
CLEANFILES += *.csv
-
+
TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
-TESTS =
-if HAVE_GTEST
-TESTS += run_unittests
+TESTS =
+if HAVE_GTEST
+TESTS += run_unittests
run_unittests_SOURCES = run_unittests.cc
run_unittests_SOURCES += bigint_unittest.cc
run_unittests_SOURCES += boost_time_utils_unittest.cc
-run_unittests_SOURCES += buffer_unittest.cc
+run_unittests_SOURCES += buffer_unittest.cc
run_unittests_SOURCES += chrono_time_utils_unittest.cc
run_unittests_SOURCES += csv_file_unittest.cc
run_unittests_SOURCES += dhcp_space_unittest.cc
@@ -55,14 +55,14 @@ run_unittests_SOURCES += versioned_csv_file_unittest.cc
run_unittests_SOURCES += watch_socket_unittests.cc
run_unittests_SOURCES += watched_thread_unittest.cc
-run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
-
+run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+
run_unittests_LDADD = $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/io/libkea-util-io.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
-endif
-
-noinst_PROGRAMS = $(TESTS)
+endif
+
+noinst_PROGRAMS = $(TESTS)
diff --git a/src/lib/util/tests/run_unittests.cc b/src/lib/util/tests/run_unittests.cc
index 7335822c7b..32a419684b 100644
--- a/src/lib/util/tests/run_unittests.cc
+++ b/src/lib/util/tests/run_unittests.cc
@@ -1,18 +1,18 @@
// Copyright (C) 2011-2015 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 http://mozilla.org/MPL/2.0/.
-
+
#include <config.h>
#include <util/unittests/run_all.h>
-
+
#include <gtest/gtest.h>
-
-int
-main(int argc, char* argv[]) {
- ::testing::InitGoogleTest(&argc, argv);
+
+int
+main(int argc, char* argv[]) {
+ ::testing::InitGoogleTest(&argc, argv);
return (isc::util::unittests::run_all());
-}
+}