Konstruktordelegáció

C++11-esítés

include/dns_db.h

@@ -28,6 +28,7 @@ class dns_db
 	 * Initializes the readable_DNS_types lut if it has not been yet.
 	 */
 	void init_lut();
+	dns_db(const dns_db& other);
 protected:
 	/**
 	 * Stores the readable c string values for all the DNS query types
@@ -44,7 +45,6 @@ public:
 	 * @param filename The database file to open.
 	 */
 	explicit dns_db(const char *filename);
-	dns_db(const dns_db& other);
 
 	/**
 	 * Opens database file referred by filename;

include/dns_server.h

@@ -50,7 +50,6 @@ public:
 	dns_server();
 	dns_server(const general_sockaddr_wp& addr);
 	dns_server(const general_sockaddr_wp& addr, const char *db_path);
-	dns_server(const general_sockaddr_wp& addr, const dns_db& __db);
 
 	/**
 	 * Opens an sqlite database.

include/udp_socket_wp.h

@@ -34,7 +34,7 @@ public:
 	 * Creates a new SOCK_DGRAM socket in given domain.
 	 * @param __domain Address family of the socket
 	 */
-	explicit udp_socket_wp(int __domain): fd(-1), domain(-1) { create_socket(__domain); }
+	explicit udp_socket_wp(int __domain): udp_socket_wp() { create_socket(__domain); }
 
 	/**
 	 * Sets the domain of the socket.

src/dns_db.cpp

@@ -43,8 +43,7 @@ dns_db::dns_db(): db(NULL) {
 	init_lut();
 }
 
-dns_db::dns_db(const char* filename): db(NULL) {
-	init_lut();
+dns_db::dns_db(const char* filename): dns_db() {
 	this->open(filename);
 }
 

src/dns_server.cpp

@@ -14,19 +14,15 @@ extern bool verbose;
 
 dns_server::dns_server(): running(false), threads(NULL), thread_num(0) { }
 
-dns_server::dns_server(const general_sockaddr_wp& addr): running(false), threads(NULL), thread_num(0) {
+dns_server::dns_server(const general_sockaddr_wp& addr): dns_server() {
 	init(addr);
 }
 
-dns_server::dns_server(const general_sockaddr_wp& addr, const char *db_path): running(false), threads(NULL), thread_num(0) {
+dns_server::dns_server(const general_sockaddr_wp& addr, const char *db_path): dns_server() {
 	init(addr);
 	connect_db(db_path);
 }
 
-dns_server::dns_server(const general_sockaddr_wp& addr, const dns_db& __db): db(__db), running(false), threads(NULL), thread_num(0) {
-	init(addr);
-}
-
 void dns_server::init(const general_sockaddr_wp& addr) {
 	pthread_mutex_lock(&mutex);
 	this->socket.close_socket(); // in case it's being changed