diff options
| author | Damien Miller <djm@mindrot.org> | 2008-07-16 22:40:52 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-07-16 22:40:52 +1000 |
| commit | b9d3bee0031e9f6acef85556eb6418a728e605f5 (patch) | |
| tree | 4777bb4a21c2a98380c75d8caf829300cf953e43 | |
| parent | 94717b0be1860c0c1abc9331388689e3ffbedea3 (diff) | |
- djm@cvs.openbsd.org 2008/07/16 11:51:14
[clientloop.c]
rename variable first_gc -> last_gc (since it is actually the last
in the list).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | clientloop.c | 14 |
2 files changed, 12 insertions, 8 deletions
@@ -4,6 +4,10 @@ [sftp.1] number of pipelined requests is now 64; prodded by Iain.Morgan AT nasa.gov + - djm@cvs.openbsd.org 2008/07/16 11:51:14 + [clientloop.c] + rename variable first_gc -> last_gc (since it is actually the last + in the list). 20080714 - (djm) OpenBSD CVS Sync @@ -4677,4 +4681,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5085 2008/07/16 11:17:23 djm Exp $ +$Id: ChangeLog,v 1.5086 2008/07/16 12:40:52 djm Exp $ diff --git a/clientloop.c b/clientloop.c index 5a8727eb..f10fab76 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.200 2008/07/10 18:08:11 markus Exp $ */ +/* $OpenBSD: clientloop.c,v 1.201 2008/07/16 11:51:14 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -741,14 +741,14 @@ client_expect_confirm(int id, const char *request, int do_close) void client_register_global_confirm(global_confirm_cb *cb, void *ctx) { - struct global_confirm *gc, *first_gc; + struct global_confirm *gc, *last_gc; /* Coalesce identical callbacks */ - first_gc = TAILQ_LAST(&global_confirms, global_confirms); - if (first_gc && first_gc->cb == cb && first_gc->ctx == ctx) { - if (++first_gc->ref_count >= INT_MAX) - fatal("%s: first_gc->ref_count = %d", - __func__, first_gc->ref_count); + last_gc = TAILQ_LAST(&global_confirms, global_confirms); + if (last_gc && last_gc->cb == cb && last_gc->ctx == ctx) { + if (++last_gc->ref_count >= INT_MAX) + fatal("%s: last_gc->ref_count = %d", + __func__, last_gc->ref_count); return; } |