From d129ecb0f98ea6e7e83f2a0a8914d3f99d5184c9 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 26 Oct 2007 16:41:14 +1000 Subject: [PATCH] - deraadt@cvs.openbsd.org 2005/02/25 13:29:30 [openbsd-compat/sys-queue.h] minor white spacing --- ChangeLog | 5 ++++- openbsd-compat/sys-queue.h | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6627ebae4..83724f34a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,9 @@ Remove useless ``elm'' argument from the SIMPLEQ_REMOVE_HEAD macro. This matches our SLIST behaviour and NetBSD's SIMPLEQ as well. ok millert krw deraadt + - deraadt@cvs.openbsd.org 2005/02/25 13:29:30 + [openbsd-compat/sys-queue.h] + minor white spacing - (djm) [regress/sftp-cmds.sh] Use more restrictive glob to pick up test files from /bin - some platforms ship broken symlinks there which could spoil the test. @@ -3375,4 +3378,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.4786 2007/10/26 06:40:20 djm Exp $ +$Id: ChangeLog,v 1.4787 2007/10/26 06:41:14 djm Exp $ diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h index 71eec0e8c..61e4ca7b0 100644 --- a/openbsd-compat/sys-queue.h +++ b/openbsd-compat/sys-queue.h @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ +/* $OpenBSD: queue.h,v 1.27 2005/02/25 13:29:30 deraadt Exp $ */ /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ /* @@ -229,10 +229,10 @@ struct { \ #define SLIST_REMOVE(head, elm, type, field) do { \ if ((head)->slh_first == (elm)) { \ SLIST_REMOVE_HEAD((head), field); \ - } \ - else { \ + } else { \ struct type *curelm = (head)->slh_first; \ - while( curelm->field.sle_next != (elm) ) \ + \ + while (curelm->field.sle_next != (elm)) \ curelm = curelm->field.sle_next; \ curelm->field.sle_next = \ curelm->field.sle_next->field.sle_next; \