summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy C. Reed <jreed@ISC.org>2011-12-14 14:39:35 +0100
committerJeremy C. Reed <jreed@ISC.org>2011-12-14 14:39:35 +0100
commit4d9485ae50a13a37c1c1c4bb1dd43998c83d5c69 (patch)
treefd903711b8381fd26a53c9d07c259804b9a7b553
parent[992] ChangeLog update. (diff)
downloadkea-4d9485ae50a13a37c1c1c4bb1dd43998c83d5c69.tar.xz
kea-4d9485ae50a13a37c1c1c4bb1dd43998c83d5c69.zip
[master] whitespace police
-rw-r--r--configure.ac2
-rw-r--r--src/bin/dhcp4/Makefile.am1
-rw-r--r--src/lib/cryptolink/tests/Makefile.am2
-rw-r--r--src/lib/datasrc/database.cc2
-rw-r--r--src/lib/statistics/tests/counter_dict_unittest.cc2
5 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 5dab45b7f9..671a9b6769 100644
--- a/configure.ac
+++ b/configure.ac
@@ -730,7 +730,7 @@ then
GTEST_FOUND="true"
# There is no gtest-config script on this
# system, which is supposed to inform us
- # whether we need pthreads as well (a
+ # whether we need pthreads as well (a
# gtest compile-time option). So we still
# need to test that manually.
CPPFLAGS_SAVED="$CPPFLAGS"
diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 71a4531c00..d8c5819d55 100644
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -39,4 +39,3 @@ b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/liblog.la
# and can't use @datadir@ because doesn't expand default ${prefix}
b10_dhcp4dir = $(pkgdatadir)
b10_dhcp4_DATA = dhcp4.spec
-
diff --git a/src/lib/cryptolink/tests/Makefile.am b/src/lib/cryptolink/tests/Makefile.am
index 6ac6fdfd7c..fbe1bad350 100644
--- a/src/lib/cryptolink/tests/Makefile.am
+++ b/src/lib/cryptolink/tests/Makefile.am
@@ -16,7 +16,7 @@ TESTS += run_unittests
run_unittests_SOURCES = run_unittests.cc
run_unittests_SOURCES += crypto_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS)
+run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD) $(BOTAN_LIBS)
run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 6e0b02b526..bf7f6ae54d 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -412,7 +412,7 @@ DatabaseClient::Finder::findDelegationPoint(const isc::dns::Name& name,
// cut but the match we find for the glue is a wildcard match. In that
// case, we return the delegation instead (see RFC 1034, section 4.3.3).
// To save a new search, we record the location of the delegation cut when
- // we encounter it here.
+ // we encounter it here.
isc::dns::ConstRRsetPtr first_ns;
// We want to search from the apex down. We are given the full domain
diff --git a/src/lib/statistics/tests/counter_dict_unittest.cc b/src/lib/statistics/tests/counter_dict_unittest.cc
index 34ab21912e..2578b46632 100644
--- a/src/lib/statistics/tests/counter_dict_unittest.cc
+++ b/src/lib/statistics/tests/counter_dict_unittest.cc
@@ -101,7 +101,7 @@ TEST_F(CounterDictionaryTest, invalidCounterItem) {
TEST_F(CounterDictionaryTest, uniquenessCheck) {
// Adding an element which already exists will cause an isc::OutOfRange
- // exception
+ // exception
EXPECT_THROW(counters.addElement("test"), isc::InvalidParameter);
}