From 849e70073f74caff131f89622f5ece60f704e6cb Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Wed, 6 Feb 2019 00:29:53 +0100 Subject: [PATCH] [master] Some trivial doxygen fixes --- src/bin/dhcp4/json_config_parser.h | 2 +- src/lib/dhcpsrv/config_backend_dhcp4.h | 2 +- src/lib/dhcpsrv/srv_config.h | 2 +- src/lib/eval/token.h | 3 +-- src/lib/mysql/mysql_binding.cc | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/bin/dhcp4/json_config_parser.h b/src/bin/dhcp4/json_config_parser.h index 8202d3f0b9..5b1de6b889 100644 --- a/src/bin/dhcp4/json_config_parser.h +++ b/src/bin/dhcp4/json_config_parser.h @@ -60,7 +60,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set, bool check_only = false); -/// @param Fetch and merge data from config backends into the staging config +/// @brief Fetch and merge data from config backends into the staging config /// /// If the given SrvConfig specifies one or more config backends it calls /// @c databaseConfigConnect() to open connections to them, otherwise it diff --git a/src/lib/dhcpsrv/config_backend_dhcp4.h b/src/lib/dhcpsrv/config_backend_dhcp4.h index 8e25920cac..9b0b3d49a4 100644 --- a/src/lib/dhcpsrv/config_backend_dhcp4.h +++ b/src/lib/dhcpsrv/config_backend_dhcp4.h @@ -186,7 +186,7 @@ public: /// @brief Retrieves the most recent audit entries. /// - /// @param selector Server selector. + /// @param server_selector Server selector. /// @param modification_time Timestamp being a lower limit for the returned /// result set, i.e. entries later than specified time are returned. /// @return Collection of audit entries. diff --git a/src/lib/dhcpsrv/srv_config.h b/src/lib/dhcpsrv/srv_config.h index c30e1304fd..04a9966080 100644 --- a/src/lib/dhcpsrv/srv_config.h +++ b/src/lib/dhcpsrv/srv_config.h @@ -460,7 +460,7 @@ public: return (equals(other)); } - /// @param other An object to be compared with this object. + /// @brief other An object to be compared with this object. /// /// It ignores the configuration sequence number when checking for /// inequality of objects. diff --git a/src/lib/eval/token.h b/src/lib/eval/token.h index 2978cdc53b..d3559fd21b 100644 --- a/src/lib/eval/token.h +++ b/src/lib/eval/token.h @@ -1,4 +1,4 @@ -// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2015-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 @@ -233,7 +233,6 @@ public: }; /// @brief Constructor that takes an option code as a parameter - /// @param option_code code of the option /// /// Note: There is no constructor that takes option_name, as it would /// introduce complex dependency of the libkea-eval on libdhcpsrv. diff --git a/src/lib/mysql/mysql_binding.cc b/src/lib/mysql/mysql_binding.cc index 75b5174d3f..ff23a290c3 100644 --- a/src/lib/mysql/mysql_binding.cc +++ b/src/lib/mysql/mysql_binding.cc @@ -106,7 +106,7 @@ MySqlBinding::createBlob(const unsigned long length) { } MySqlBindingPtr -MySqlBinding::createTimestamp(const ptime& timestamp) { +MySqlBinding::createTimestamp(const boost::posix_time::ptime& timestamp) { MySqlBindingPtr binding(new MySqlBinding(MySqlBindingTraits::column_type, MySqlBindingTraits::length)); binding->setTimestampValue(timestamp); @@ -146,7 +146,7 @@ MySqlBinding::convertToDatabaseTime(const time_t input_time, } void -MySqlBinding::convertToDatabaseTime(const ptime& input_time, +MySqlBinding::convertToDatabaseTime(const boost::posix_time::ptime& input_time, MYSQL_TIME& output_time) { if (input_time.is_not_a_date_time()) { isc_throw(BadValue, "Time value is not a valid posix time"); -- 2.47.2