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

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

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