From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Tue, 5 Jul 2005 07:15:29 +0000 (+0000)
Subject: remove getchar() from sstuff -it upsets g++ 2.95 on freebsd
X-Git-Tag: pdns-2.9.18~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab2cee5658ab5f8208cb6e73fa1a5dc5a926ecc5;p=pdns

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 d42d94f1d..b879a3875 100644
--- 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 ee7436a07..eb75e91ad 100755
--- 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;