Update version numbers to be between releases

[adns.git] / client / adnslogres.c

diff --git a/client/adnslogres.c b/client/adnslogres.c
index df4753d0da70e726ac7adb6f0e29119867858c3b..a93e855efa1e665f45378982393efbb9b61a23cd 100644 (file)
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -8,12 +8,15 @@
  *   Copyright (C) 1999-2000 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  *  It is part of adns, which is
- *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+ *    Copyright (C) 1997-2000,2003,2006,2014  Ian Jackson
+ *    Copyright (C) 2014  Mark Wooding
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)
  *  
  *  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, or (at your option)
+ *  the Free Software Foundation; either version 3, or (at your option)
  *  any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
@@ -22,8 +25,7 @@
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  along with this program; if not, write to the Free Software Foundation.
  *
  *  This version was originally supplied by Tony Finch, but has been
  *  modified by Ian Jackson as it was incorporated into adns and
@@ -152,7 +154,7 @@ static logline *readline(FILE *inf, adns_state adns, int opts) {
     strcpy(line->start, buf);
     str= ipaddr2domain(line->start, &line->addr, &line->rest);
     if (opts & OPT_DEBUG)
-      msg("submitting %.*s -> %s", line->rest-line->addr, guard_null(line->addr), str);
+      msg("submitting %.*s -> %s", (int)(line->rest-line->addr), guard_null(line->addr), str);
     if (adns_submit(adns, str, adns_r_ptr,
                    adns_qf_quoteok_cname|adns_qf_cname_loose,
                    NULL, &line->query))
@@ -184,7 +186,7 @@ static void proclog(FILE *inf, FILE *outf, int maxpending, int opts) {
     while (head) {
       if (opts & OPT_DEBUG)
        msg("%d in queue; checking %.*s", len,
-           head->rest-head->addr, guard_null(head->addr));
+           (int)(head->rest-head->addr), guard_null(head->addr));
       if (eof || len >= maxpending) {
        if (opts & OPT_POLL)
          err= adns_wait_poll(adns, &head->query, &answer, NULL);