Commit 059a2a17 authored by Mukund Sivaraman's avatar Mukund Sivaraman

[2357] Update scaffolding using fix-scaffolding.py tool

See bug #2367 for the fix-scaffolding.py tool.
parent 6d135861
......@@ -18,8 +18,8 @@
#include <cc/data.h>
#ifndef __CONFIG_H
#define __CONFIG_H 1
#ifndef CONFIG_H
#define CONFIG_H 1
class AuthSrv;
......@@ -195,7 +195,7 @@ void configureAuthServer(AuthSrv& server,
AuthConfigParser* createAuthConfigParser(AuthSrv& server,
const std::string& config_id);
#endif // __CONFIG_H
#endif // CONFIG_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __AUTH_LOG__H
#define __AUTH_LOG__H
#ifndef AUTH_LOG_H
#define AUTH_LOG_H
#include <log/macros.h>
#include <auth/auth_messages.h>
......@@ -53,4 +53,4 @@ extern isc::log::Logger auth_logger;
} // namespace nsas
} // namespace isc
#endif // __AUTH_LOG__H
#endif // AUTH_LOG_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __AUTH_SRV_H
#define __AUTH_SRV_H 1
#ifndef AUTH_SRV_H
#define AUTH_SRV_H 1
#include <config/ccsession.h>
......@@ -328,7 +328,7 @@ private:
isc::asiodns::DNSServiceBase* dnss_;
};
#endif // __AUTH_SRV_H
#endif // AUTH_SRV_H
// Local Variables:
// mode: c++
......
......@@ -16,8 +16,8 @@
#include <cc/data.h>
#ifndef __COMMAND_H
#define __COMMAND_H 1
#ifndef COMMAND_H
#define COMMAND_H 1
class AuthSrv;
......@@ -54,7 +54,7 @@ isc::data::ConstElementPtr
execAuthServerCommand(AuthSrv& server, const std::string& command_id,
isc::data::ConstElementPtr args);
#endif // __COMMAND_H
#endif // COMMAND_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __COMMON_H
#define __COMMON_H 1
#ifndef COMMON_H
#define COMMON_H 1
#include <stdexcept>
#include <string>
......@@ -62,7 +62,7 @@ extern const char* const AUTH_NAME;
/// This is sent to interested modules (currently only b10-ddns)
extern const char* const AUTH_STARTED_NOTIFICATION;
#endif // __COMMON_H
#endif // COMMON_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __STATISTICS_H
#define __STATISTICS_H 1
#ifndef STATISTICS_H
#define STATISTICS_H 1
#include <dns/opcode.h>
#include <dns/rcode.h>
......@@ -178,7 +178,7 @@ public:
void registerStatisticsValidator(AuthCounters::validator_type validator) const;
};
#endif // __STATISTICS_H
#endif // STATISTICS_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __AUTH_DATA_SOURCE_UTIL_H
#define __AUTH_DATA_SOURCE_UTIL_H 1
#ifndef AUTH_DATA_SOURCE_UTIL_H
#define AUTH_DATA_SOURCE_UTIL_H 1
#include <dns/name.h>
#include <dns/rrclass.h>
......@@ -51,7 +51,7 @@ createSQLite3DB(dns::RRClass zclass, const dns::Name& zname,
} // end of auth
} // end of isc
#endif // __AUTH_DATA_SOURCE_UTIL_H
#endif // AUTH_DATA_SOURCE_UTIL_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __DHCP4_LOG__H
#define __DHCP4_LOG__H
#ifndef DHCP4_LOG_H
#define DHCP4_LOG_H
#include <log/macros.h>
#include <log/logger_support.h>
......@@ -56,4 +56,4 @@ extern isc::log::Logger dhcp4_logger;
} // namespace dhcp4
} // namespace isc
#endif // __DHCP4_LOG__H
#endif // DHCP4_LOG_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __DHCP6_LOG__H
#define __DHCP6_LOG__H
#ifndef DHCP6_LOG_H
#define DHCP6_LOG_H
#include <log/macros.h>
#include <log/logger_support.h>
......@@ -56,4 +56,4 @@ extern isc::log::Logger dhcp6_logger;
} // namespace dhcp6
} // namespace isc
#endif // __DHCP6_LOG__H
#endif // DHCP6_LOG_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __RESOLVER_H
#define __RESOLVER_H 1
#ifndef RESOLVER_H
#define RESOLVER_H 1
#include <string>
#include <vector>
......@@ -266,7 +266,7 @@ private:
isc::cache::ResolverCache* cache_;
};
#endif // __RESOLVER_H
#endif // RESOLVER_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __RESOLVER_LOG__H
#define __RESOLVER_LOG__H
#ifndef RESOLVER_LOG_H
#define RESOLVER_LOG_H
#include <log/macros.h>
#include "resolver_messages.h"
......@@ -46,4 +46,4 @@ const int RESOLVER_DBG_DETAIL = DBGLVL_TRACE_DETAIL_DATA;
/// space.
extern isc::log::Logger resolver_logger;
#endif // __RESOLVER_LOG__H
#endif // RESOLVER_LOG_H
......@@ -14,8 +14,8 @@
// $Id$
#ifndef __RESPONSE_SCRUBBER_H
#define __RESPONSE_SCRUBBER_H
#ifndef RESPONSE_SCRUBBER_H
#define RESPONSE_SCRUBBER_H
/// \page DataScrubbing Data Scrubbing
/// \section DataScrubbingIntro Introduction
......@@ -419,4 +419,4 @@ public:
}
};
#endif // __RESPONSE_SCRUBBER_H
#endif // RESPONSE_SCRUBBER_H
......@@ -18,8 +18,8 @@
/// This module holds the functionality of the socket creator. It is a separate
/// module from main to make testing easier.
#ifndef __SOCKCREATOR_H
#define __SOCKCREATOR_H 1
#ifndef SOCKCREATOR_H
#define SOCKCREATOR_H 1
#include <util/io/fd_share.h>
#include <exceptions/exceptions.h>
......@@ -144,4 +144,4 @@ run(const int input_fd, const int output_fd, get_sock_t get_sock_fun,
} // namespace socket_creator
} // NAMESPACE ISC
#endif // __SOCKCREATOR_H
#endif // SOCKCREATOR_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __DNSNAME_CHECK_H
#define __DNSNAME_CHECK_H 1
#ifndef DNSNAME_CHECK_H
#define DNSNAME_CHECK_H 1
#include <dns/name.h>
......@@ -76,7 +76,7 @@ private:
} // namespace acl
} // namespace isc
#endif // __DNSNAME_CHECK_H
#endif // DNSNAME_CHECK_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __IP_CHECK_H
#define __IP_CHECK_H
#ifndef IP_CHECK_H
#define IP_CHECK_H
#include <sys/socket.h>
......@@ -410,7 +410,7 @@ const size_t IPCheck<Context>::IPV4_SIZE;
} // namespace acl
} // namespace isc
#endif // __IP_CHECK_H
#endif // IP_CHECK_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __ACL_TEST_SOCKADDR_H
#define __ACL_TEST_SOCKADDR_H 1
#ifndef ACL_TEST_SOCKADDR_H
#define ACL_TEST_SOCKADDR_H 1
#include <sys/types.h>
#include <sys/socket.h>
......@@ -62,7 +62,7 @@ getSockAddr(const char* const addr) {
} // end of namespace "acl"
} // end of namespace "isc"
#endif // __ACL_TEST_SOCKADDR_H
#endif // ACL_TEST_SOCKADDR_H
// Local Variables:
// mode: c++
......
......@@ -12,12 +12,12 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __ASIODNS_H
#define __ASIODNS_H 1
#ifndef ASIODNS_H
#define ASIODNS_H 1
#include <asiodns/dns_service.h>
#include <asiodns/dns_server.h>
#include <asiodns/dns_lookup.h>
#include <asiodns/dns_answer.h>
#endif // __ASIODNS_H
#endif // ASIODNS_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __ASIOLINK_DNS_ANSWER_H
#define __ASIOLINK_DNS_ANSWER_H 1
#ifndef ASIOLINK_DNS_ANSWER_H
#define ASIOLINK_DNS_ANSWER_H 1
#include <asiolink/io_message.h>
#include <util/buffer.h>
......@@ -74,4 +74,4 @@ public:
} // namespace asiodns
} // namespace isc
#endif // __ASIOLINK_DNS_ANSWER_H
#endif // ASIOLINK_DNS_ANSWER_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __ASIOLINK_DNS_LOOKUP_H
#define __ASIOLINK_DNS_LOOKUP_H 1
#ifndef ASIOLINK_DNS_LOOKUP_H
#define ASIOLINK_DNS_LOOKUP_H 1
#include <asiolink/io_message.h>
#include <asiodns/dns_server.h>
......@@ -84,4 +84,4 @@ private:
} // namespace asiodns
} // namespace isc
#endif // __ASIOLINK_DNS_LOOKUP_H
#endif // ASIOLINK_DNS_LOOKUP_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __ASIOLINK_DNS_SERVER_H
#define __ASIOLINK_DNS_SERVER_H 1
#ifndef ASIOLINK_DNS_SERVER_H
#define ASIOLINK_DNS_SERVER_H 1
#include <asiolink/io_message.h>
......@@ -152,4 +152,4 @@ private:
} // namespace asiodns
} // namespace isc
#endif // __ASIOLINK_DNS_SERVER_H
#endif // ASIOLINK_DNS_SERVER_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __ASIOLINK_DNS_SERVICE_H
#define __ASIOLINK_DNS_SERVICE_H 1
#ifndef ASIOLINK_DNS_SERVICE_H
#define ASIOLINK_DNS_SERVICE_H 1
#include <resolve/resolver_interface.h>
......@@ -210,7 +210,7 @@ private:
} // namespace asiodns
} // namespace isc
#endif // __ASIOLINK_DNS_SERVICE_H
#endif // ASIOLINK_DNS_SERVICE_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __IO_FETCH_H
#define __IO_FETCH_H 1
#ifndef IO_FETCH_H
#define IO_FETCH_H 1
#include <config.h>
......@@ -229,4 +229,4 @@ private:
} // namespace asiodns
} // namespace isc
#endif // __IO_FETCH_H
#endif // IO_FETCH_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __SYNC_UDP_SERVER_H
#define __SYNC_UDP_SERVER_H 1
#ifndef SYNC_UDP_SERVER_H
#define SYNC_UDP_SERVER_H 1
#ifndef ASIO_HPP
#error "asio.hpp must be included before including this, see asiolink.h as to why"
......@@ -145,4 +145,4 @@ private:
} // namespace asiodns
} // namespace isc
#endif // __SYNC_UDP_SERVER_H
#endif // SYNC_UDP_SERVER_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __TCP_SERVER_H
#define __TCP_SERVER_H 1
#ifndef TCP_SERVER_H
#define TCP_SERVER_H 1
#ifndef ASIO_HPP
#error "asio.hpp must be included before including this, see asiolink.h as to why"
......@@ -147,4 +147,4 @@ private:
} // namespace asiodns
} // namespace isc
#endif // __TCP_SERVER_H
#endif // TCP_SERVER_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __UDP_SERVER_H
#define __UDP_SERVER_H 1
#ifndef UDP_SERVER_H
#define UDP_SERVER_H 1
#ifndef ASIO_HPP
#error "asio.hpp must be included before including this, see asiolink.h as to why"
......@@ -96,4 +96,4 @@ private:
} // namespace asiodns
} // namespace isc
#endif // __UDP_SERVER_H
#endif // UDP_SERVER_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __ASIOLINK_H
#define __ASIOLINK_H 1
#ifndef ASIOLINK_H
#define ASIOLINK_H 1
// IMPORTANT NOTE: only very few ASIO headers files can be included in
// this file. In particular, asio.hpp should never be included here.
......@@ -74,4 +74,4 @@
/// the placeholder of callback handlers:
/// http://think-async.com/Asio/asio-1.3.1/doc/asio/reference/asio_handler_allocate.html
#endif // __ASIOLINK_H
#endif // ASIOLINK_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __DUMMY_IO_CB_H
#define __DUMMY_IO_CB_H
#ifndef DUMMY_IO_CB_H
#define DUMMY_IO_CB_H
#include <iostream>
......@@ -59,4 +59,4 @@ public:
} // namespace asiolink
} // namespace isc
#endif // __DUMMY_IO_CB_H
#endif // DUMMY_IO_CB_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __ASIOLINK_INTERVAL_TIMER_H
#define __ASIOLINK_INTERVAL_TIMER_H 1
#ifndef ASIOLINK_INTERVAL_TIMER_H
#define ASIOLINK_INTERVAL_TIMER_H 1
#include <boost/function.hpp>
#include <boost/shared_ptr.hpp>
......@@ -130,4 +130,4 @@ private:
} // namespace asiolink
} // namespace isc
#endif // __ASIOLINK_INTERVAL_TIMER_H
#endif // ASIOLINK_INTERVAL_TIMER_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __IO_ADDRESS_H
#define __IO_ADDRESS_H 1
#ifndef IO_ADDRESS_H
#define IO_ADDRESS_H 1
// IMPORTANT NOTE: only very few ASIO headers files can be included in
// this file. In particular, asio.hpp should never be included here.
......@@ -215,4 +215,4 @@ private:
} // namespace asiolink
} // namespace isc
#endif // __IO_ADDRESS_H
#endif // IO_ADDRESS_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __IO_ASIO_SOCKET_H
#define __IO_ASIO_SOCKET_H 1
#ifndef IO_ASIO_SOCKET_H
#define IO_ASIO_SOCKET_H 1
// IMPORTANT NOTE: only very few ASIO headers files can be included in
// this file. In particular, asio.hpp should never be included here.
......@@ -385,4 +385,4 @@ private:
} // namespace asiolink
} // namespace isc
#endif // __IO_ASIO_SOCKET_H
#endif // IO_ASIO_SOCKET_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __IO_ENDPOINT_H
#define __IO_ENDPOINT_H 1
#ifndef IO_ENDPOINT_H
#define IO_ENDPOINT_H 1
// IMPORTANT NOTE: only very few ASIO headers files can be included in
// this file. In particular, asio.hpp should never be included here.
......@@ -184,7 +184,7 @@ public:
std::ostream& operator<<(std::ostream& os, const IOEndpoint& endpoint);
} // namespace asiolink
} // namespace isc
#endif // __IO_ENDPOINT_H
#endif // IO_ENDPOINT_H
// Local Variables:
// mode: c++
......
......@@ -13,8 +13,8 @@
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __IO_ERROR_H
#define __IO_ERROR_H
#ifndef IO_ERROR_H
#define IO_ERROR_H
#include <exceptions/exceptions.h>
......@@ -34,4 +34,4 @@ public:
} // namespace asiolink
} // namespace isc
#endif // __IO_ERROR_H
#endif // IO_ERROR_H