From b99f5f714ba889a831591a1bdf436e29041c7dab Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 26 Oct 2007 16:40:20 +1000 Subject: [PATCH] - grange@cvs.openbsd.org 2004/05/04 16:59:32 [openbsd-compat/sys-queue.h] 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 --- ChangeLog | 7 ++++++- openbsd-compat/sys-queue.h | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d061c4de5..6627ebae4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,11 @@ - tdeval@cvs.openbsd.org 2004/11/24 18:10:42 [openbsd-compat/sys-tree.h] typo + - grange@cvs.openbsd.org 2004/05/04 16:59:32 + [openbsd-compat/sys-queue.h] + 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 - (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. @@ -3370,4 +3375,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.4785 2007/10/26 06:39:05 djm Exp $ +$Id: ChangeLog,v 1.4786 2007/10/26 06:40:20 djm Exp $ diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h index 402343324..71eec0e8c 100644 --- a/openbsd-compat/sys-queue.h +++ b/openbsd-compat/sys-queue.h @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.h,v 1.25 2004/04/08 16:08:21 henning Exp $ */ +/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ /* @@ -369,8 +369,8 @@ struct { \ (listelm)->field.sqe_next = (elm); \ } while (0) -#define SIMPLEQ_REMOVE_HEAD(head, elm, field) do { \ - if (((head)->sqh_first = (elm)->field.sqe_next) == NULL) \ +#define SIMPLEQ_REMOVE_HEAD(head, field) do { \ + if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \ (head)->sqh_last = &(head)->sqh_first; \ } while (0)