From: Francis Dupont Date: Thu, 10 Jan 2019 14:33:28 +0000 (+0100) Subject: [365-automatically-calculate-the-values-for-options-58-and-59] Removed extra traling... X-Git-Tag: 313-return-a-list-of-all-reservations-by-subnet-id_base~1^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ea2febaae2437967c81f0e7fc094132380fdd44;p=thirdparty%2Fkea.git [365-automatically-calculate-the-values-for-options-58-and-59] Removed extra traling spaces --- diff --git a/src/lib/cc/data.h b/src/lib/cc/data.h index a8989f09fa..0e37d60f5d 100644 --- a/src/lib/cc/data.h +++ b/src/lib/cc/data.h @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2018 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2010-2019 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 @@ -746,7 +746,7 @@ void merge(ElementPtr element, ConstElementPtr other); /// negative means outbound and perhaps looping forever). /// @return a pointer to a fresh copy /// @throw raises a BadValue is a null pointer occurs. -ElementPtr copy(ConstElementPtr from, int level = 100); +ElementPtr copy(ConstElementPtr from, int level = 100); /// @brief Compares the data with other using unordered lists /// diff --git a/src/lib/cc/simple_parser.h b/src/lib/cc/simple_parser.h index c469839e59..26341018ff 100644 --- a/src/lib/cc/simple_parser.h +++ b/src/lib/cc/simple_parser.h @@ -172,9 +172,9 @@ class SimpleParser { /// @param scope specified parameter will be extracted from this scope /// @param name name of the parameter /// @return a double value of the parameter - /// @throw DhcpConfigError if the parameter is not there or is not + /// @throw DhcpConfigError if the parameter is not there or is not /// an Element::real - static double getDouble(const ConstElementPtr& scope, + static double getDouble(const ConstElementPtr& scope, const std::string& name); protected: diff --git a/src/lib/cc/tests/command_interpreter_unittests.cc b/src/lib/cc/tests/command_interpreter_unittests.cc index 2f2b661192..1ab02a72b2 100644 --- a/src/lib/cc/tests/command_interpreter_unittests.cc +++ b/src/lib/cc/tests/command_interpreter_unittests.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2018 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2009-2019 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 @@ -70,7 +70,7 @@ TEST(CommandInterpreterTest, parseAnswer) { EXPECT_THROW(parseAnswer(rcode, el("{ \"result\": [ 0 ] }")), CtrlChannelError); EXPECT_THROW(parseAnswer(rcode, el("{ \"result\": [ 1 ] }")), CtrlChannelError); EXPECT_THROW(parseAnswer(rcode, el("{ \"result\": [ 1, 1 ] }")), CtrlChannelError); - + answer = el("{ \"result\": 0 }"); arg = parseAnswer(rcode, answer); EXPECT_EQ(0, rcode); diff --git a/src/lib/cc/tests/simple_parser_unittest.cc b/src/lib/cc/tests/simple_parser_unittest.cc index f9bb2f9b6e..a43dc6a4fb 100644 --- a/src/lib/cc/tests/simple_parser_unittest.cc +++ b/src/lib/cc/tests/simple_parser_unittest.cc @@ -242,7 +242,7 @@ TEST_F(SimpleParserTest, getIOAddress) { TEST_F(SimpleParserTest, getDouble) { SimpleParserClassTest parser; - std::string json = + std::string json = "{\n" " \"string\" : \"12.3\",\n" " \"bool\" : true, \n"