summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-21 00:09:54 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-21 00:09:54 +0000
commit61c183bea34f06a14458d9102a6365132c0396db (patch)
tree6026156131b4b8986b71570d4918af08c18bc763
parent2b266b7f083e969cba04a035eba46a6d96c0c1e3 (diff)
- itojun@cvs.openbsd.org 2002/06/16 21:30:58
[ssh-keyscan.c] use TAILQ_xx macro. from lukem@netbsd. markus ok
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keyscan.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8001c884..a053d352 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
remove the CONSTRAIN_IDENTITY messages and introduce a new
ADD_ID message with contraints instead. contraints can be
only added together with the private key.
+ - itojun@cvs.openbsd.org 2002/06/16 21:30:58
+ [ssh-keyscan.c]
+ use TAILQ_xx macro. from lukem@netbsd. markus ok
20020613
- (bal) typo of setgroup for cygwin. Patch by vinschen@redhat.com
@@ -945,4 +948,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2221 2002/06/21 00:08:39 mouring Exp $
+$Id: ChangeLog,v 1.2222 2002/06/21 00:09:54 mouring Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 744f8024..333a38e3 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.35 2002/03/04 18:30:23 stevesk Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.36 2002/06/16 21:30:58 itojun Exp $");
#include "openbsd-compat/fake-queue.h"
@@ -600,7 +600,7 @@ conloop(void)
con *c;
gettimeofday(&now, NULL);
- c = tq.tqh_first;
+ c = TAILQ_FIRST(&tq);
if (c && (c->c_tv.tv_sec > now.tv_sec ||
(c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec > now.tv_usec))) {
@@ -633,12 +633,12 @@ conloop(void)
xfree(r);
xfree(e);
- c = tq.tqh_first;
+ c = TAILQ_FIRST(&tq);
while (c && (c->c_tv.tv_sec < now.tv_sec ||
(c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec < now.tv_usec))) {
int s = c->c_fd;
- c = c->c_link.tqe_next;
+ c = TAILQ_NEXT(c, c_link);
conrecycle(s);
}
}