From: Mark Wooding Date: Sat, 24 May 2014 13:00:03 +0000 (+0100) Subject: Remove unused variables. X-Git-Tag: make-bug.2014-07-26~53 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=faa525942b2ca4964c4a020728768368cab85bd5 Remove unused variables. Signed-off-by: Mark Wooding --- diff --git a/regress/hplayback.c b/regress/hplayback.c index 594f7e6..d229f34 100644 --- a/regress/hplayback.c +++ b/regress/hplayback.c @@ -194,11 +194,10 @@ static int Pbytes(byte *buf, int maxlen) { } } void Q_vb(void) { - int r; 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); diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4 index 868aa52..679cff1 100644 --- 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) { - int r; 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); diff --git a/src/event.c b/src/event.c index ad5861e..e22a8d1 100644 --- a/src/event.c +++ b/src/event.c @@ -43,9 +43,6 @@ /* 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; diff --git a/src/reply.c b/src/reply.c index 64b41d7..62384ab 100644 --- 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 anstart, nsstart, arstart; + int anstart, nsstart; 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; - 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.