Remove unused variables.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>

diff --git a/regress/hplayback.c b/regress/hplayback.c
index 594f7e60decc9f68c6a302bf59e77d9edf0bdeb7..d229f34f6f9680cf5d419fbb49f550ffdb5114d9 100644 (file)
--- a/regress/hplayback.c
+++ b/regress/hplayback.c
@@ -194,11 +194,10 @@ static int Pbytes(byte *buf, int maxlen) {
   }
 }
 void Q_vb(void) {
   }
 }
 void Q_vb(void) {

-  int r;

   const char *nl;
   Tensurerecordfile();
   if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();
   const char *nl;
   Tensurerecordfile();
   if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();

-  r= fread(vb2.buf,1,vb.used+2,Tinputfile);
+  fread(vb2.buf,1,vb.used+2,Tinputfile);

   if (feof(Tinputfile)) {
     fprintf(stderr,"adns test harness: input ends prematurely; program did:\n %.*s\n",
            vb.used,vb.buf);
   if (feof(Tinputfile)) {
     fprintf(stderr,"adns test harness: input ends prematurely; program did:\n %.*s\n",
            vb.used,vb.buf);

diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index 868aa527ddc8d515702bec939236095247a8e40e..679cff16a928a76ffb935123db480160d5418eed 100644 (file)
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -257,12 +257,11 @@ static int Pbytes(byte *buf, int maxlen) {
 }
   
 void Q_vb(void) {
 }
   
 void Q_vb(void) {

-  int r;

   const char *nl;
 
   Tensurerecordfile();
   if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();
   const char *nl;
 
   Tensurerecordfile();
   if (!adns__vbuf_ensure(&vb2,vb.used+2)) Tnomem();

-  r= fread(vb2.buf,1,vb.used+2,Tinputfile);
+  fread(vb2.buf,1,vb.used+2,Tinputfile);

   if (feof(Tinputfile)) {
     fprintf(stderr,"adns test harness: input ends prematurely; program did:\n %.*s\n",
            vb.used,vb.buf);
   if (feof(Tinputfile)) {
     fprintf(stderr,"adns test harness: input ends prematurely; program did:\n %.*s\n",
            vb.used,vb.buf);

diff --git a/src/event.c b/src/event.c
index ad5861ec65c578a571a27e45d8497b9bf767200d..e22a8d1c8c768d06524c7102fee10a42499edfec 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -43,9 +43,6 @@
 /* TCP connection management. */
 
 static void tcp_close(adns_state ads) {
 /* TCP connection management. */
 
 static void tcp_close(adns_state ads) {

-  int serv;
-  
-  serv= ads->tcpserver;

   close(ads->tcpsocket);
   ads->tcpsocket= -1;
   ads->tcprecv.used= ads->tcprecv_skip= ads->tcpsend.used= 0;
   close(ads->tcpsocket);
   ads->tcpsocket= -1;
   ads->tcprecv.used= ads->tcprecv_skip= ads->tcpsend.used= 0;

diff --git a/src/reply.c b/src/reply.c
index 64b41d72ce82688d88c2c923791f3b3da70d77a2..62384ab9571d70c3b7d25e850e3ae5836a974ad9 100644 (file)
--- a/src/reply.c
+++ b/src/reply.c
@@ -34,7 +34,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
   int id, f1, f2, qdcount, ancount, nscount, arcount;
   int flg_ra, flg_rd, flg_tc, flg_qr, opcode;
   int rrtype, rrclass, rdlength, rdstart;
   int id, f1, f2, qdcount, ancount, nscount, arcount;
   int flg_ra, flg_rd, flg_tc, flg_qr, opcode;
   int rrtype, rrclass, rdlength, rdstart;

-  int anstart, nsstart, arstart;
+  int anstart, nsstart;

   int ownermatched, l, nrrs;
   unsigned long ttl, soattl;
   const typeinfo *typei;
   int ownermatched, l, nrrs;
   unsigned long ttl, soattl;
   const typeinfo *typei;


@@ -157,7 +157,6 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
    * query now. */
   
   anstart= qu->query_dglen;
    * query now. */
   
   anstart= qu->query_dglen;

-  arstart= -1;

 
   /* Now, take a look at the answer section, and see if it is complete.
    * If it has any CNAMEs we stuff them in the answer.
 
   /* Now, take a look at the answer section, and see if it is complete.
    * If it has any CNAMEs we stuff them in the answer.