remove getchar() from sstuff -it upsets g++ 2.95 on freebsd

add anadns.hh

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@430 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index d42d94f1dfb57d2187c4e08fd6f6125a85864b39..b879a387505d90a63ae9778b46b98cddc9abb53c 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -55,7 +55,7 @@ dnswasher_SOURCES=dnswasher.cc misc.cc unix_utility.cc qtype.cc \
 
 dnswasher_LDFLAGS= @THREADFLAGS@ @DYNLINKFLAGS@ 
 
-dnsreplay_SOURCES=dnsreplay.cc misc.cc unix_utility.cc qtype.cc \
+dnsreplay_SOURCES=dnsreplay.cc misc.cc unix_utility.cc qtype.cc anadns.hh \
        logger.cc statbag.cc  dnspcap.cc dnspcap.hh dnsparser.cc dnsrecords.cc dnsparser.hh 
 
 dnsreplay_LDFLAGS= @THREADFLAGS@ @DYNLINKFLAGS@ 

diff --git a/pdns/sstuff.hh b/pdns/sstuff.hh
index ee7436a07e037a2aa85231f7dfe6428886d49eb2..eb75e91ad020c237c27698b0d214ef806d707232 100755 (executable)
--- a/pdns/sstuff.hh
+++ b/pdns/sstuff.hh
@@ -274,7 +274,7 @@ public:
 
 
   //! reads one character from the socket 
-  int getchar()
+  int getChar()
   {
     char c;
 
@@ -286,9 +286,9 @@ public:
 
   void getline(string &data)
   {
-    data.clear();
+    data="";
     int c;
-    while((c=getchar())!=-1) {
+    while((c=getChar())!=-1) {
       data+=(char)c;
       if(c=='\n')
        break;