Changeset 568

Timestamp:

03/02/06 22:21:16 (7 years ago)

Author:

ahu

Message:

g++ 4.1 fixes (all trivial), copyright update

Location:

trunk/pdns/pdns

Files:

• arguments.cc (modified) (2 diffs)
• arguments.hh (modified) (1 diff)
• packetcache.hh (modified) (1 diff)
• packethandler.hh (modified) (1 diff)
• receiver.cc (modified) (2 diffs)
• ueberbackend.hh (modified) (1 diff)

trunk/pdns/pdns/arguments.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002  PowerDNS.COM BV
+    Copyright (C) 2002 - 2006  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    it under the terms of the GNU General Public License version 2 as published 
+    by the Free Software Foundation
 
     This program is distributed in the hope that it will be useful,
@@ -21 +20 @@
 
 #include "arguments.hh"
-
-
 
 const ArgvMap::param_t::const_iterator ArgvMap::begin()

trunk/pdns/pdns/arguments.hh

@@ -78 +78 @@
     parse(argc,argv,true);
   }
-  void ArgvMap::preParse(int &argc, char **argv, const string &arg); //!< use this to preparse a single var
-  bool ArgvMap::preParseFile(const char *fname, const string &arg); //!< use this to preparse a single var in configuration
+  void preParse(int &argc, char **argv, const string &arg); //!< use this to preparse a single var
+  bool preParseFile(const char *fname, const string &arg); //!< use this to preparse a single var in configuration
 
   bool file(const char *fname, bool lax=false); //!< Parses a file with parameters

trunk/pdns/pdns/packetcache.hh

@@ -64 +64 @@
   PacketCache();
   void insert(DNSPacket *q, DNSPacket *r);  //!< We copy the contents of *p into our cache. Do not needlessly call this to insert questions already in the cache as it wastes resources
-  void PacketCache::insert(const char *packet, int length);
+  void insert(const char *packet, int length);
 
   inline int get(DNSPacket *p, DNSPacket *q); //!< We return a dynamically allocated copy out of our cache. You need to delete it. You also need to spoof in the right ID with the DNSPacket.spoofID() method.

trunk/pdns/pdns/packethandler.hh

@@ -83 +83 @@
   int processNotify(DNSPacket *);
   void addRootReferral(DNSPacket *r);
-  int PacketHandler::trySuperMaster(DNSPacket *p);
+  int trySuperMaster(DNSPacket *p);
   int makeCanonic(DNSPacket *p, DNSPacket *r, string &target);
   int doWildcardRecords(DNSPacket *p, DNSPacket *r, string &target);

trunk/pdns/pdns/receiver.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002 - 2005  PowerDNS.COM BV
+    Copyright (C) 2002 - 2006  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -573 +573 @@
   DLOG(L<<Logger::Warning<<"Verbose logging in effect"<<endl);
   
-  L<<Logger::Warning<<"PowerDNS "<<VERSION<<" (C) 2001-2005 PowerDNS.COM BV ("<<__DATE__", "__TIME__;
+  L<<Logger::Warning<<"PowerDNS "<<VERSION<<" (C) 2001-2006 PowerDNS.COM BV ("<<__DATE__", "__TIME__;
 #ifdef __GNUC__
   L<<", gcc "__VERSION__;

trunk/pdns/pdns/ueberbackend.hh

@@ -121 +121 @@
   static DNSBackend *maker(const map<string,string> &);
   static void closeDynListener();
-  static void UeberBackend::setStatus(const string &st);
+  static void setStatus(const string &st);
   void getUnfreshSlaveInfos(vector<DomainInfo>* domains);
   void getUpdatedMasters(vector<DomainInfo>* domains);