From: Kees Monshouwer Date: Mon, 5 Aug 2013 19:44:05 +0000 (+0200) Subject: s/ahuexception/pdnsexception part 2 X-Git-Tag: rec-3.6.0-rc1~521^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c409fa22b6a63a960ec9d0c6c4cf0c0f9a54a10;p=thirdparty%2Fpdns.git s/ahuexception/pdnsexception part 2 --- diff --git a/modules/db2backend/DB2Backend.cc b/modules/db2backend/DB2Backend.cc index 4839f2cfa5..8c3a9986ae 100644 --- a/modules/db2backend/DB2Backend.cc +++ b/modules/db2backend/DB2Backend.cc @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/modules/gmysqlbackend/gmysqlbackend.cc b/modules/gmysqlbackend/gmysqlbackend.cc index ba5cc095f1..4631db932f 100644 --- a/modules/gmysqlbackend/gmysqlbackend.cc +++ b/modules/gmysqlbackend/gmysqlbackend.cc @@ -7,7 +7,7 @@ #include "gmysqlbackend.hh" #include "pdns/dnspacket.hh" #include "pdns/ueberbackend.hh" -#include "pdns/ahuexception.hh" +#include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" #include "smysql.hh" diff --git a/modules/godbcbackend/godbcbackend.cc b/modules/godbcbackend/godbcbackend.cc index 0c2f8f76e1..be7b69ed3b 100644 --- a/modules/godbcbackend/godbcbackend.cc +++ b/modules/godbcbackend/godbcbackend.cc @@ -10,7 +10,7 @@ #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" #include "pdns/ueberbackend.hh" -#include "pdns/ahuexception.hh" +#include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" #include "sodbc.hh" diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc index 0dc3407ae4..a45146e195 100644 --- a/modules/goraclebackend/goraclebackend.cc +++ b/modules/goraclebackend/goraclebackend.cc @@ -9,7 +9,7 @@ #include "goraclebackend.hh" #include "pdns/dnspacket.hh" #include "pdns/ueberbackend.hh" -#include "pdns/ahuexception.hh" +#include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/gpgsqlbackend/gpgsqlbackend.cc b/modules/gpgsqlbackend/gpgsqlbackend.cc index 62e7da5313..e725d420d8 100644 --- a/modules/gpgsqlbackend/gpgsqlbackend.cc +++ b/modules/gpgsqlbackend/gpgsqlbackend.cc @@ -8,7 +8,7 @@ #include "gpgsqlbackend.hh" #include "pdns/dnspacket.hh" #include "pdns/ueberbackend.hh" -#include "pdns/ahuexception.hh" +#include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/modules/gsqlite3backend/gsqlite3backend.cc b/modules/gsqlite3backend/gsqlite3backend.cc index 6fde3e4fce..3c2e86656f 100644 --- a/modules/gsqlite3backend/gsqlite3backend.cc +++ b/modules/gsqlite3backend/gsqlite3backend.cc @@ -14,7 +14,7 @@ #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" #include "pdns/ueberbackend.hh" -#include "pdns/ahuexception.hh" +#include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" #include "pdns/ssqlite3.hh" diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh index a907422213..c84aed9751 100644 --- a/modules/ldapbackend/ldapbackend.hh +++ b/modules/ldapbackend/ldapbackend.hh @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include "powerldap.hh" diff --git a/modules/mydnsbackend/mydnsbackend.cc b/modules/mydnsbackend/mydnsbackend.cc index 9df88cd15b..a1f88dfa36 100644 --- a/modules/mydnsbackend/mydnsbackend.cc +++ b/modules/mydnsbackend/mydnsbackend.cc @@ -32,7 +32,7 @@ #include "mydnsbackend.hh" #include #include -#include +#include #include #include diff --git a/modules/opendbxbackend/odbxbackend.hh b/modules/opendbxbackend/odbxbackend.hh index be6348397f..7e826a2d3f 100644 --- a/modules/opendbxbackend/odbxbackend.hh +++ b/modules/opendbxbackend/odbxbackend.hh @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/pipebackend/coprocess.cc b/modules/pipebackend/coprocess.cc index d9ca44e66a..110c5033d5 100644 --- a/modules/pipebackend/coprocess.cc +++ b/modules/pipebackend/coprocess.cc @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/pipebackend/pipebackend.cc b/modules/pipebackend/pipebackend.cc index 0ac908211b..4b5ee77bb8 100644 --- a/modules/pipebackend/pipebackend.cc +++ b/modules/pipebackend/pipebackend.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/randombackend/randombackend.cc b/modules/randombackend/randombackend.cc index 6b2fac8e83..6893a1b1b7 100644 --- a/modules/randombackend/randombackend.cc +++ b/modules/randombackend/randombackend.cc @@ -21,7 +21,7 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ahuexception.hh" +#include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include diff --git a/modules/remotebackend/remotebackend.hh b/modules/remotebackend/remotebackend.hh index 2f2d717b83..312acb43f3 100644 --- a/modules/remotebackend/remotebackend.hh +++ b/modules/remotebackend/remotebackend.hh @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc index 7fa1be8b47..590ef7ca1f 100644 --- a/modules/remotebackend/test-remotebackend-http.cc +++ b/modules/remotebackend/test-remotebackend-http.cc @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc index 04b3966b8e..fcbb9b30fc 100644 --- a/modules/remotebackend/test-remotebackend-json.cc +++ b/modules/remotebackend/test-remotebackend-json.cc @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc index 3b0d55ee1f..b238de8609 100644 --- a/modules/remotebackend/test-remotebackend-pipe.cc +++ b/modules/remotebackend/test-remotebackend-pipe.cc @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include "pdns/dnsrecords.hh" diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc index 8326e5a855..e22e842b95 100644 --- a/modules/remotebackend/test-remotebackend-post.cc +++ b/modules/remotebackend/test-remotebackend-post.cc @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc index b2f9ca09e8..6825b32f72 100644 --- a/modules/remotebackend/test-remotebackend-unix.cc +++ b/modules/remotebackend/test-remotebackend-unix.cc @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include "pdns/dnsrecords.hh" diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc index 28427c8a6f..012dc325c6 100644 --- a/modules/remotebackend/test-remotebackend.cc +++ b/modules/remotebackend/test-remotebackend.cc @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/xdbbackend/xdb-fill.cc b/modules/xdbbackend/xdb-fill.cc index 2df29072a3..f92c29ee45 100644 --- a/modules/xdbbackend/xdb-fill.cc +++ b/modules/xdbbackend/xdb-fill.cc @@ -1,7 +1,7 @@ #include "pdns/utility.hh" #include "xgdbm.hh" #include "xtdb.hh" -#include "pdns/ahuexception.hh" +#include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include #include diff --git a/modules/xdbbackend/xdbbackend.cc b/modules/xdbbackend/xdbbackend.cc index 560b964970..5a153e1620 100644 --- a/modules/xdbbackend/xdbbackend.cc +++ b/modules/xdbbackend/xdbbackend.cc @@ -4,7 +4,7 @@ #include "pdns/dns.hh" #include "pdns/dnsbackend.hh" #include "pdns/dnspacket.hh" -#include "pdns/ahuexception.hh" +#include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 754864a301..d339390753 100644 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@ -38,7 +38,7 @@ toysdig dnsdemog dnswasher dnsscan nproxy notify pdnssec dnsbulktest nsec3dig # pdns_server_SOURCES=dnspacket.cc nameserver.cc tcpreceiver.hh \ qtype.cc logger.cc arguments.cc packethandler.cc tcpreceiver.cc \ -packetcache.cc statbag.cc ahuexception.hh arguments.hh distributor.hh \ +packetcache.cc statbag.cc pdnsexception.hh arguments.hh distributor.hh \ dns.hh dnsbackend.hh dnsbackend.cc dnspacket.hh dynmessenger.hh lock.hh logger.hh \ nameserver.hh packetcache.hh packethandler.hh qtype.hh statbag.hh \ ueberbackend.hh pdns.conf-dist ws.hh ws.cc webserver.cc webserver.hh \ diff --git a/pdns/arguments.hh b/pdns/arguments.hh index 45e114bacd..c62ece7afc 100644 --- a/pdns/arguments.hh +++ b/pdns/arguments.hh @@ -26,7 +26,7 @@ #include #include #include "misc.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #ifndef WIN32 # include # include diff --git a/pdns/backends/bind/bindparser.yy b/pdns/backends/bind/bindparser.yy index c58bc139fb..0fd148e595 100644 --- a/pdns/backends/bind/bindparser.yy +++ b/pdns/backends/bind/bindparser.yy @@ -8,7 +8,7 @@ #include #include #include "misc.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "namespaces.hh" #define YYDEBUG 1 extern int yydebug; diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc index 2ff5263075..7be5d2ed46 100644 --- a/pdns/backends/gsql/gsqlbackend.cc +++ b/pdns/backends/gsql/gsqlbackend.cc @@ -31,7 +31,7 @@ #include "gsqlbackend.hh" #include "pdns/dnspacket.hh" #include "pdns/ueberbackend.hh" -#include "pdns/ahuexception.hh" +#include "pdns/pdnsexception.hh" #include "pdns/logger.hh" #include "pdns/arguments.hh" #include "pdns/base32.hh" diff --git a/pdns/distributor.hh b/pdns/distributor.hh index 76067a7dfe..dd610b4d15 100644 --- a/pdns/distributor.hh +++ b/pdns/distributor.hh @@ -35,7 +35,7 @@ #include "logger.hh" #include "dns.hh" #include "dnsbackend.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "arguments.hh" #include "statbag.hh" diff --git a/pdns/dnsbackend.hh b/pdns/dnsbackend.hh index 0221951279..46478721d8 100644 --- a/pdns/dnsbackend.hh +++ b/pdns/dnsbackend.hh @@ -26,7 +26,7 @@ class DNSPacket; #include #include #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include #include diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc index 435eb388d1..a4859298cd 100644 --- a/pdns/dnspacket.cc +++ b/pdns/dnspacket.cc @@ -30,7 +30,7 @@ #include "dnsseckeeper.hh" #include "dns.hh" #include "dnsbackend.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "dnspacket.hh" #include "logger.hh" #include "arguments.hh" diff --git a/pdns/dnspacket.hh b/pdns/dnspacket.hh index 60bec234ac..64d41740a3 100644 --- a/pdns/dnspacket.hh +++ b/pdns/dnspacket.hh @@ -51,7 +51,7 @@ #include "misc.hh" #include "utility.hh" #include "logger.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "dnsrecords.hh" #ifdef HAVE_CONFIG_H diff --git a/pdns/dnsproxy.cc b/pdns/dnsproxy.cc index afa114ffaa..6c18b123a9 100644 --- a/pdns/dnsproxy.cc +++ b/pdns/dnsproxy.cc @@ -18,7 +18,7 @@ #include "packetcache.hh" #include "utility.hh" #include "dnsproxy.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include #include #include "dns.hh" diff --git a/pdns/dynloader.cc b/pdns/dynloader.cc index 943165e138..e48a394241 100644 --- a/pdns/dynloader.cc +++ b/pdns/dynloader.cc @@ -30,7 +30,7 @@ #include #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "misc.hh" #include "dynmessenger.hh" #include "arguments.hh" diff --git a/pdns/dynmessenger.hh b/pdns/dynmessenger.hh index ed9bc3e2b5..59ad1004fb 100644 --- a/pdns/dynmessenger.hh +++ b/pdns/dynmessenger.hh @@ -36,7 +36,7 @@ #include #include "iputils.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "namespaces.hh" diff --git a/pdns/iputils.hh b/pdns/iputils.hh index 14844dfb85..c435a221e0 100644 --- a/pdns/iputils.hh +++ b/pdns/iputils.hh @@ -30,7 +30,7 @@ #include #include #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "misc.hh" #include #include diff --git a/pdns/lock.hh b/pdns/lock.hh index 749ec7aa1d..3bb5e4a740 100644 --- a/pdns/lock.hh +++ b/pdns/lock.hh @@ -22,7 +22,7 @@ #include #include #include "misc.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" extern bool g_singleThreaded; diff --git a/pdns/lwres.cc b/pdns/lwres.cc index 660f7df325..a76550963f 100644 --- a/pdns/lwres.cc +++ b/pdns/lwres.cc @@ -30,7 +30,7 @@ #include #include "dns.hh" #include "qtype.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "arguments.hh" #include "sstuff.hh" #include "syncres.hh" diff --git a/pdns/lwres.hh b/pdns/lwres.hh index 045e0c8cec..c54be2a09f 100644 --- a/pdns/lwres.hh +++ b/pdns/lwres.hh @@ -36,7 +36,7 @@ # undef res_mkquery #endif // WIN32 -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "dns.hh" #include "namespaces.hh" diff --git a/pdns/misc.cc b/pdns/misc.cc index 52844603be..a64a00d0ef 100644 --- a/pdns/misc.cc +++ b/pdns/misc.cc @@ -39,7 +39,7 @@ #include #include #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include #include "utility.hh" #include diff --git a/pdns/ahuexception.hh b/pdns/pdnsexception.hh similarity index 95% rename from pdns/ahuexception.hh rename to pdns/pdnsexception.hh index 53a20fc9fa..d7f054b4bd 100644 --- a/pdns/ahuexception.hh +++ b/pdns/pdnsexception.hh @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AHUEXCEPTION_HH -#define AHUEXCEPTION_HH +#ifndef PDNSEXCEPTION_HH +#define PDNSEXCEPTION_HH /* (C) 2002 POWERDNS.COM BV */ #include diff --git a/pdns/rec_channel.cc b/pdns/rec_channel.cc index 56ab81d196..38d70daf22 100644 --- a/pdns/rec_channel.cc +++ b/pdns/rec_channel.cc @@ -9,7 +9,7 @@ #include #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "namespaces.hh" diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc index a97cbbbef1..47abfde4eb 100644 --- a/pdns/rec_control.cc +++ b/pdns/rec_control.cc @@ -17,7 +17,7 @@ */ #include "rec_channel.hh" #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "arguments.hh" #include "config.h" diff --git a/pdns/resolver.cc b/pdns/resolver.cc index 7ae35adf15..2523916de2 100644 --- a/pdns/resolver.cc +++ b/pdns/resolver.cc @@ -33,7 +33,7 @@ #include "dns.hh" #include "qtype.hh" #include "tcpreceiver.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "statbag.hh" #include "arguments.hh" #include "base64.hh" diff --git a/pdns/resolver.hh b/pdns/resolver.hh index 6877e6a056..36d7e91e48 100644 --- a/pdns/resolver.hh +++ b/pdns/resolver.hh @@ -33,7 +33,7 @@ # undef res_mkquery #endif // WIN32 -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "dns.hh" #include "namespaces.hh" #include "dnsbackend.hh" diff --git a/pdns/session.cc b/pdns/session.cc index 2fcbd80be7..0e338d35a0 100644 --- a/pdns/session.cc +++ b/pdns/session.cc @@ -18,7 +18,7 @@ */ #include "utility.hh" #include "session.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "misc.hh" #include #include diff --git a/pdns/session.hh b/pdns/session.hh index 8e61e01918..0cc5432a64 100644 --- a/pdns/session.hh +++ b/pdns/session.hh @@ -35,7 +35,7 @@ #endif // WIN32 #include "iputils.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" class SessionException: public PDNSException { diff --git a/pdns/statbag.cc b/pdns/statbag.cc index b63e3d63d1..83421ff75f 100644 --- a/pdns/statbag.cc +++ b/pdns/statbag.cc @@ -19,7 +19,7 @@ #include "utility.hh" #include "statbag.hh" -#include "ahuexception.hh" +#include "pdnsexception.hh" #include #include #include diff --git a/pdns/unix_semaphore.cc b/pdns/unix_semaphore.cc index 02b1e93d05..0afb9cb6c1 100644 --- a/pdns/unix_semaphore.cc +++ b/pdns/unix_semaphore.cc @@ -21,7 +21,7 @@ #include #include #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "logger.hh" #include "misc.hh" #include diff --git a/pdns/unix_utility.cc b/pdns/unix_utility.cc index 987a405529..08c0d76571 100644 --- a/pdns/unix_utility.cc +++ b/pdns/unix_utility.cc @@ -21,7 +21,7 @@ #include #include #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "logger.hh" #include "misc.hh" #include diff --git a/pdns/win32_dynloader.cc b/pdns/win32_dynloader.cc index dea837c785..f6f9001d56 100644 --- a/pdns/win32_dynloader.cc +++ b/pdns/win32_dynloader.cc @@ -30,7 +30,7 @@ #include #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "misc.hh" #include "dynmessenger.hh" #include "arguments.hh" diff --git a/pdns/win32_rec_channel.cc b/pdns/win32_rec_channel.cc index 32a4dc2c1c..d58a735b83 100644 --- a/pdns/win32_rec_channel.cc +++ b/pdns/win32_rec_channel.cc @@ -4,7 +4,7 @@ #include #include -#include "ahuexception.hh" +#include "pdnsexception.hh" #include "namespaces.hh"