Module Name: src
Committed By: rillig
Date: Fri Jul 3 08:37:57 UTC 2020
Modified Files:
src/usr.bin/make/lst.lib: lstAppend.c lstAtEnd.c lstAtFront.c
lstClose.c lstConcat.c lstDatum.c lstDeQueue.c lstDupl.c
lstEnQueue.c lstFind.c lstFindFrom.c lstFirst.c lstForEach.c
lstForEachFrom.c lstInit.c lstInsert.c lstIsAtEnd.c lstIsEmpty.c
lstLast.c lstNext.c lstOpen.c lstPrev.c lstRemove.c lstReplace.c
lstSucc.c
Log Message:
make(1): remove redundant parentheses around return value
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/lst.lib/lstAppend.c \
src/usr.bin/make/lst.lib/lstDeQueue.c \
src/usr.bin/make/lst.lib/lstInsert.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/lst.lib/lstAtEnd.c \
src/usr.bin/make/lst.lib/lstAtFront.c src/usr.bin/make/lst.lib/lstDatum.c \
src/usr.bin/make/lst.lib/lstEnQueue.c \
src/usr.bin/make/lst.lib/lstForEach.c \
src/usr.bin/make/lst.lib/lstIsAtEnd.c \
src/usr.bin/make/lst.lib/lstReplace.c src/usr.bin/make/lst.lib/lstSucc.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/lst.lib/lstClose.c \
src/usr.bin/make/lst.lib/lstIsEmpty.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/lst.lib/lstConcat.c \
src/usr.bin/make/lst.lib/lstDupl.c src/usr.bin/make/lst.lib/lstRemove.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/lst.lib/lstFind.c \
src/usr.bin/make/lst.lib/lstFindFrom.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/lst.lib/lstFirst.c \
src/usr.bin/make/lst.lib/lstInit.c src/usr.bin/make/lst.lib/lstLast.c \
src/usr.bin/make/lst.lib/lstNext.c src/usr.bin/make/lst.lib/lstOpen.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/lst.lib/lstForEachFrom.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/lst.lib/lstPrev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/lst.lib/lstAppend.c
diff -u src/usr.bin/make/lst.lib/lstAppend.c:1.14 src/usr.bin/make/lst.lib/lstAppend.c:1.15
--- src/usr.bin/make/lst.lib/lstAppend.c:1.14 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstAppend.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstAppend.c,v 1.14 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstAppend.c,v 1.15 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstAppend.c,v 1.14 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstAppend.c,v 1.15 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstAppend.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstAppend.c,v 1.14 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstAppend.c,v 1.15 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -85,7 +85,7 @@ Lst_InsertAfter(Lst l, LstNode ln, void
}
if (!LstValid (l) || LstIsEmpty (l) || ! LstNodeValid (ln, l)) {
- return (FAILURE);
+ return FAILURE;
}
ok:
@@ -117,6 +117,5 @@ Lst_InsertAfter(Lst l, LstNode ln, void
}
}
- return (SUCCESS);
+ return SUCCESS;
}
-
Index: src/usr.bin/make/lst.lib/lstDeQueue.c
diff -u src/usr.bin/make/lst.lib/lstDeQueue.c:1.14 src/usr.bin/make/lst.lib/lstDeQueue.c:1.15
--- src/usr.bin/make/lst.lib/lstDeQueue.c:1.14 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstDeQueue.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstDeQueue.c,v 1.14 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstDeQueue.c,v 1.15 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstDeQueue.c,v 1.14 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstDeQueue.c,v 1.15 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstDeQueue.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstDeQueue.c,v 1.14 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstDeQueue.c,v 1.15 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -81,7 +81,6 @@ Lst_DeQueue(Lst l)
if (Lst_Remove(l, tln) == FAILURE) {
return NULL;
} else {
- return (rd);
+ return rd;
}
}
-
Index: src/usr.bin/make/lst.lib/lstInsert.c
diff -u src/usr.bin/make/lst.lib/lstInsert.c:1.14 src/usr.bin/make/lst.lib/lstInsert.c:1.15
--- src/usr.bin/make/lst.lib/lstInsert.c:1.14 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstInsert.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstInsert.c,v 1.14 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstInsert.c,v 1.15 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstInsert.c,v 1.14 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstInsert.c,v 1.15 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstInsert.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstInsert.c,v 1.14 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstInsert.c,v 1.15 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -87,7 +87,7 @@ Lst_InsertBefore(Lst l, LstNode ln, void
goto ok;
if (!LstValid (l) || LstIsEmpty (l) || !LstNodeValid (ln, l)) {
- return (FAILURE);
+ return FAILURE;
}
ok:
@@ -117,6 +117,5 @@ Lst_InsertBefore(Lst l, LstNode ln, void
}
}
- return (SUCCESS);
+ return SUCCESS;
}
-
Index: src/usr.bin/make/lst.lib/lstAtEnd.c
diff -u src/usr.bin/make/lst.lib/lstAtEnd.c:1.13 src/usr.bin/make/lst.lib/lstAtEnd.c:1.14
--- src/usr.bin/make/lst.lib/lstAtEnd.c:1.13 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstAtEnd.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstAtEnd.c,v 1.13 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstAtEnd.c,v 1.14 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstAtEnd.c,v 1.13 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstAtEnd.c,v 1.14 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstAtEnd.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstAtEnd.c,v 1.13 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstAtEnd.c,v 1.14 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -75,5 +75,5 @@ Lst_AtEnd(Lst l, void *d)
LstNode end;
end = Lst_Last(l);
- return (Lst_InsertAfter(l, end, d));
+ return Lst_InsertAfter(l, end, d);
}
Index: src/usr.bin/make/lst.lib/lstAtFront.c
diff -u src/usr.bin/make/lst.lib/lstAtFront.c:1.13 src/usr.bin/make/lst.lib/lstAtFront.c:1.14
--- src/usr.bin/make/lst.lib/lstAtFront.c:1.13 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstAtFront.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstAtFront.c,v 1.13 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstAtFront.c,v 1.14 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstAtFront.c,v 1.13 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstAtFront.c,v 1.14 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstAtFront.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstAtFront.c,v 1.13 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstAtFront.c,v 1.14 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -72,5 +72,5 @@ Lst_AtFront(Lst l, void *d)
LstNode front;
front = Lst_First(l);
- return (Lst_InsertBefore(l, front, d));
+ return Lst_InsertBefore(l, front, d);
}
Index: src/usr.bin/make/lst.lib/lstDatum.c
diff -u src/usr.bin/make/lst.lib/lstDatum.c:1.13 src/usr.bin/make/lst.lib/lstDatum.c:1.14
--- src/usr.bin/make/lst.lib/lstDatum.c:1.13 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstDatum.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstDatum.c,v 1.13 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstDatum.c,v 1.14 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstDatum.c,v 1.13 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstDatum.c,v 1.14 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstDatum.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstDatum.c,v 1.13 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstDatum.c,v 1.14 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -69,9 +69,8 @@ void *
Lst_Datum(LstNode ln)
{
if (ln != NULL) {
- return ((ln)->datum);
+ return ln->datum;
} else {
return NULL;
}
}
-
Index: src/usr.bin/make/lst.lib/lstEnQueue.c
diff -u src/usr.bin/make/lst.lib/lstEnQueue.c:1.13 src/usr.bin/make/lst.lib/lstEnQueue.c:1.14
--- src/usr.bin/make/lst.lib/lstEnQueue.c:1.13 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstEnQueue.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstEnQueue.c,v 1.13 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstEnQueue.c,v 1.14 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstEnQueue.c,v 1.13 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstEnQueue.c,v 1.14 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstEnQueue.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstEnQueue.c,v 1.13 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstEnQueue.c,v 1.14 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -70,9 +70,8 @@ ReturnStatus
Lst_EnQueue(Lst l, void *d)
{
if (LstValid (l) == FALSE) {
- return (FAILURE);
+ return FAILURE;
}
- return (Lst_InsertAfter(l, Lst_Last(l), d));
+ return Lst_InsertAfter(l, Lst_Last(l), d);
}
-
Index: src/usr.bin/make/lst.lib/lstForEach.c
diff -u src/usr.bin/make/lst.lib/lstForEach.c:1.13 src/usr.bin/make/lst.lib/lstForEach.c:1.14
--- src/usr.bin/make/lst.lib/lstForEach.c:1.13 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstForEach.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstForEach.c,v 1.13 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstForEach.c,v 1.14 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstForEach.c,v 1.13 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstForEach.c,v 1.14 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstForEach.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstForEach.c,v 1.13 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstForEach.c,v 1.14 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -73,4 +73,3 @@ Lst_ForEach(Lst l, int (*proc)(void *, v
{
return Lst_ForEachFrom(l, Lst_First(l), proc, d);
}
-
Index: src/usr.bin/make/lst.lib/lstIsAtEnd.c
diff -u src/usr.bin/make/lst.lib/lstIsAtEnd.c:1.13 src/usr.bin/make/lst.lib/lstIsAtEnd.c:1.14
--- src/usr.bin/make/lst.lib/lstIsAtEnd.c:1.13 Fri Feb 15 21:29:50 2008
+++ src/usr.bin/make/lst.lib/lstIsAtEnd.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstIsAtEnd.c,v 1.13 2008/02/15 21:29:50 christos Exp $ */
+/* $NetBSD: lstIsAtEnd.c,v 1.14 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstIsAtEnd.c,v 1.13 2008/02/15 21:29:50 christos Exp $";
+static char rcsid[] = "$NetBSD: lstIsAtEnd.c,v 1.14 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstIsAtEnd.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstIsAtEnd.c,v 1.13 2008/02/15 21:29:50 christos Exp $");
+__RCSID("$NetBSD: lstIsAtEnd.c,v 1.14 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -81,7 +81,6 @@ Lst_IsAtEnd(Lst l)
{
List list = l;
- return (!LstValid (l) || !list->isOpen ||
- (list->atEnd == Head) || (list->atEnd == Tail));
+ return !LstValid (l) || !list->isOpen ||
+ list->atEnd == Head || list->atEnd == Tail;
}
-
Index: src/usr.bin/make/lst.lib/lstReplace.c
diff -u src/usr.bin/make/lst.lib/lstReplace.c:1.13 src/usr.bin/make/lst.lib/lstReplace.c:1.14
--- src/usr.bin/make/lst.lib/lstReplace.c:1.13 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstReplace.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstReplace.c,v 1.13 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstReplace.c,v 1.14 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstReplace.c,v 1.13 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstReplace.c,v 1.14 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstReplace.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstReplace.c,v 1.13 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstReplace.c,v 1.14 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -69,10 +69,9 @@ ReturnStatus
Lst_Replace(LstNode ln, void *d)
{
if (ln == NULL) {
- return (FAILURE);
+ return FAILURE;
} else {
(ln)->datum = d;
- return (SUCCESS);
+ return SUCCESS;
}
}
-
Index: src/usr.bin/make/lst.lib/lstSucc.c
diff -u src/usr.bin/make/lst.lib/lstSucc.c:1.13 src/usr.bin/make/lst.lib/lstSucc.c:1.14
--- src/usr.bin/make/lst.lib/lstSucc.c:1.13 Sat Dec 13 15:19:29 2008
+++ src/usr.bin/make/lst.lib/lstSucc.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstSucc.c,v 1.13 2008/12/13 15:19:29 dsl Exp $ */
+/* $NetBSD: lstSucc.c,v 1.14 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstSucc.c,v 1.13 2008/12/13 15:19:29 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstSucc.c,v 1.14 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstSucc.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstSucc.c,v 1.13 2008/12/13 15:19:29 dsl Exp $");
+__RCSID("$NetBSD: lstSucc.c,v 1.14 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -73,7 +73,6 @@ Lst_Succ(LstNode ln)
if (ln == NULL) {
return NULL;
} else {
- return (ln->nextPtr);
+ return ln->nextPtr;
}
}
-
Index: src/usr.bin/make/lst.lib/lstClose.c
diff -u src/usr.bin/make/lst.lib/lstClose.c:1.11 src/usr.bin/make/lst.lib/lstClose.c:1.12
--- src/usr.bin/make/lst.lib/lstClose.c:1.11 Fri Oct 27 21:37:25 2006
+++ src/usr.bin/make/lst.lib/lstClose.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstClose.c,v 1.11 2006/10/27 21:37:25 dsl Exp $ */
+/* $NetBSD: lstClose.c,v 1.12 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstClose.c,v 1.11 2006/10/27 21:37:25 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstClose.c,v 1.12 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstClose.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstClose.c,v 1.11 2006/10/27 21:37:25 dsl Exp $");
+__RCSID("$NetBSD: lstClose.c,v 1.12 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -83,4 +83,3 @@ Lst_Close(Lst l)
list->atEnd = Unknown;
}
}
-
Index: src/usr.bin/make/lst.lib/lstIsEmpty.c
diff -u src/usr.bin/make/lst.lib/lstIsEmpty.c:1.11 src/usr.bin/make/lst.lib/lstIsEmpty.c:1.12
--- src/usr.bin/make/lst.lib/lstIsEmpty.c:1.11 Sat Dec 13 15:19:29 2008
+++ src/usr.bin/make/lst.lib/lstIsEmpty.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstIsEmpty.c,v 1.11 2008/12/13 15:19:29 dsl Exp $ */
+/* $NetBSD: lstIsEmpty.c,v 1.12 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstIsEmpty.c,v 1.11 2008/12/13 15:19:29 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstIsEmpty.c,v 1.12 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstIsEmpty.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstIsEmpty.c,v 1.11 2008/12/13 15:19:29 dsl Exp $");
+__RCSID("$NetBSD: lstIsEmpty.c,v 1.12 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -70,6 +70,5 @@ __RCSID("$NetBSD: lstIsEmpty.c,v 1.11 20
Boolean
Lst_IsEmpty(Lst l)
{
- return ( ! LstValid (l) || LstIsEmpty(l));
+ return !LstValid(l) || LstIsEmpty(l);
}
-
Index: src/usr.bin/make/lst.lib/lstConcat.c
diff -u src/usr.bin/make/lst.lib/lstConcat.c:1.16 src/usr.bin/make/lst.lib/lstConcat.c:1.17
--- src/usr.bin/make/lst.lib/lstConcat.c:1.16 Sat Dec 13 15:19:29 2008
+++ src/usr.bin/make/lst.lib/lstConcat.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstConcat.c,v 1.16 2008/12/13 15:19:29 dsl Exp $ */
+/* $NetBSD: lstConcat.c,v 1.17 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstConcat.c,v 1.16 2008/12/13 15:19:29 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstConcat.c,v 1.17 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstConcat.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstConcat.c,v 1.16 2008/12/13 15:19:29 dsl Exp $");
+__RCSID("$NetBSD: lstConcat.c,v 1.17 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -86,7 +86,7 @@ Lst_Concat(Lst l1, Lst l2, int flags)
List list2 = l2;
if (!LstValid (l1) || !LstValid (l2)) {
- return (FAILURE);
+ return FAILURE;
}
if (flags == LST_CONCLINK) {
@@ -180,6 +180,5 @@ Lst_Concat(Lst l1, Lst l2, int flags)
}
}
- return (SUCCESS);
+ return SUCCESS;
}
-
Index: src/usr.bin/make/lst.lib/lstDupl.c
diff -u src/usr.bin/make/lst.lib/lstDupl.c:1.16 src/usr.bin/make/lst.lib/lstDupl.c:1.17
--- src/usr.bin/make/lst.lib/lstDupl.c:1.16 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstDupl.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstDupl.c,v 1.16 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstDupl.c,v 1.17 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstDupl.c,v 1.16 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstDupl.c,v 1.17 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstDupl.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstDupl.c,v 1.16 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstDupl.c,v 1.17 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -103,5 +103,5 @@ Lst_Duplicate(Lst l, DuplicateProc *copy
}
}
- return (nl);
+ return nl;
}
Index: src/usr.bin/make/lst.lib/lstRemove.c
diff -u src/usr.bin/make/lst.lib/lstRemove.c:1.16 src/usr.bin/make/lst.lib/lstRemove.c:1.17
--- src/usr.bin/make/lst.lib/lstRemove.c:1.16 Sun Sep 7 20:55:34 2014
+++ src/usr.bin/make/lst.lib/lstRemove.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstRemove.c,v 1.16 2014/09/07 20:55:34 joerg Exp $ */
+/* $NetBSD: lstRemove.c,v 1.17 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstRemove.c,v 1.16 2014/09/07 20:55:34 joerg Exp $";
+static char rcsid[] = "$NetBSD: lstRemove.c,v 1.17 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstRemove.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstRemove.c,v 1.16 2014/09/07 20:55:34 joerg Exp $");
+__RCSID("$NetBSD: lstRemove.c,v 1.17 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -73,9 +73,8 @@ Lst_Remove(Lst l, LstNode ln)
List list = l;
ListNode lNode = ln;
- if (!LstValid (l) ||
- !LstNodeValid (ln, l)) {
- return (FAILURE);
+ if (!LstValid (l) || !LstNodeValid (ln, l)) {
+ return FAILURE;
}
/*
@@ -131,6 +130,5 @@ Lst_Remove(Lst l, LstNode ln)
lNode->flags |= LN_DELETED;
}
- return (SUCCESS);
+ return SUCCESS;
}
-
Index: src/usr.bin/make/lst.lib/lstFind.c
diff -u src/usr.bin/make/lst.lib/lstFind.c:1.15 src/usr.bin/make/lst.lib/lstFind.c:1.16
--- src/usr.bin/make/lst.lib/lstFind.c:1.15 Fri Jan 23 21:58:28 2009
+++ src/usr.bin/make/lst.lib/lstFind.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstFind.c,v 1.15 2009/01/23 21:58:28 dsl Exp $ */
+/* $NetBSD: lstFind.c,v 1.16 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstFind.c,v 1.15 2009/01/23 21:58:28 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstFind.c,v 1.16 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstFind.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstFind.c,v 1.15 2009/01/23 21:58:28 dsl Exp $");
+__RCSID("$NetBSD: lstFind.c,v 1.16 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -69,6 +69,5 @@ __RCSID("$NetBSD: lstFind.c,v 1.15 2009/
LstNode
Lst_Find(Lst l, const void *d, int (*cProc)(const void *, const void *))
{
- return (Lst_FindFrom(l, Lst_First(l), d, cProc));
+ return Lst_FindFrom(l, Lst_First(l), d, cProc);
}
-
Index: src/usr.bin/make/lst.lib/lstFindFrom.c
diff -u src/usr.bin/make/lst.lib/lstFindFrom.c:1.15 src/usr.bin/make/lst.lib/lstFindFrom.c:1.16
--- src/usr.bin/make/lst.lib/lstFindFrom.c:1.15 Fri Jan 23 21:58:28 2009
+++ src/usr.bin/make/lst.lib/lstFindFrom.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstFindFrom.c,v 1.15 2009/01/23 21:58:28 dsl Exp $ */
+/* $NetBSD: lstFindFrom.c,v 1.16 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstFindFrom.c,v 1.15 2009/01/23 21:58:28 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstFindFrom.c,v 1.16 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstFindFrom.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstFindFrom.c,v 1.15 2009/01/23 21:58:28 dsl Exp $");
+__RCSID("$NetBSD: lstFindFrom.c,v 1.16 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -81,10 +81,9 @@ Lst_FindFrom(Lst l, LstNode ln, const vo
do {
if ((*cProc)(tln->datum, d) == 0)
- return (tln);
+ return tln;
tln = tln->nextPtr;
} while (tln != ln && tln != NULL);
return NULL;
}
-
Index: src/usr.bin/make/lst.lib/lstFirst.c
diff -u src/usr.bin/make/lst.lib/lstFirst.c:1.12 src/usr.bin/make/lst.lib/lstFirst.c:1.13
--- src/usr.bin/make/lst.lib/lstFirst.c:1.12 Sat Dec 13 15:19:29 2008
+++ src/usr.bin/make/lst.lib/lstFirst.c Fri Jul 3 08:37:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstFirst.c,v 1.12 2008/12/13 15:19:29 dsl Exp $ */
+/* $NetBSD: lstFirst.c,v 1.13 2020/07/03 08:37:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstFirst.c,v 1.12 2008/12/13 15:19:29 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstFirst.c,v 1.13 2020/07/03 08:37:56 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstFirst.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstFirst.c,v 1.12 2008/12/13 15:19:29 dsl Exp $");
+__RCSID("$NetBSD: lstFirst.c,v 1.13 2020/07/03 08:37:56 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -71,7 +71,6 @@ Lst_First(Lst l)
if (!LstValid (l) || LstIsEmpty (l)) {
return NULL;
} else {
- return (l->firstPtr);
+ return l->firstPtr;
}
}
-
Index: src/usr.bin/make/lst.lib/lstInit.c
diff -u src/usr.bin/make/lst.lib/lstInit.c:1.12 src/usr.bin/make/lst.lib/lstInit.c:1.13
--- src/usr.bin/make/lst.lib/lstInit.c:1.12 Sat Dec 13 15:19:29 2008
+++ src/usr.bin/make/lst.lib/lstInit.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstInit.c,v 1.12 2008/12/13 15:19:29 dsl Exp $ */
+/* $NetBSD: lstInit.c,v 1.13 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstInit.c,v 1.12 2008/12/13 15:19:29 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstInit.c,v 1.13 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstInit.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstInit.c,v 1.12 2008/12/13 15:19:29 dsl Exp $");
+__RCSID("$NetBSD: lstInit.c,v 1.13 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -81,5 +81,5 @@ Lst_Init(Boolean circ)
nList->isCirc = circ;
nList->atEnd = Unknown;
- return (nList);
+ return nList;
}
Index: src/usr.bin/make/lst.lib/lstLast.c
diff -u src/usr.bin/make/lst.lib/lstLast.c:1.12 src/usr.bin/make/lst.lib/lstLast.c:1.13
--- src/usr.bin/make/lst.lib/lstLast.c:1.12 Sat Dec 13 15:19:29 2008
+++ src/usr.bin/make/lst.lib/lstLast.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstLast.c,v 1.12 2008/12/13 15:19:29 dsl Exp $ */
+/* $NetBSD: lstLast.c,v 1.13 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstLast.c,v 1.12 2008/12/13 15:19:29 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstLast.c,v 1.13 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstLast.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstLast.c,v 1.12 2008/12/13 15:19:29 dsl Exp $");
+__RCSID("$NetBSD: lstLast.c,v 1.13 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -71,7 +71,6 @@ Lst_Last(Lst l)
if (!LstValid(l) || LstIsEmpty (l)) {
return NULL;
} else {
- return (l->lastPtr);
+ return l->lastPtr;
}
}
-
Index: src/usr.bin/make/lst.lib/lstNext.c
diff -u src/usr.bin/make/lst.lib/lstNext.c:1.12 src/usr.bin/make/lst.lib/lstNext.c:1.13
--- src/usr.bin/make/lst.lib/lstNext.c:1.12 Sat Dec 13 15:19:29 2008
+++ src/usr.bin/make/lst.lib/lstNext.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstNext.c,v 1.12 2008/12/13 15:19:29 dsl Exp $ */
+/* $NetBSD: lstNext.c,v 1.13 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstNext.c,v 1.12 2008/12/13 15:19:29 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstNext.c,v 1.13 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstNext.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstNext.c,v 1.12 2008/12/13 15:19:29 dsl Exp $");
+__RCSID("$NetBSD: lstNext.c,v 1.13 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -115,6 +115,5 @@ Lst_Next(Lst l)
}
}
- return (tln);
+ return tln;
}
-
Index: src/usr.bin/make/lst.lib/lstOpen.c
diff -u src/usr.bin/make/lst.lib/lstOpen.c:1.12 src/usr.bin/make/lst.lib/lstOpen.c:1.13
--- src/usr.bin/make/lst.lib/lstOpen.c:1.12 Sat Dec 13 15:19:29 2008
+++ src/usr.bin/make/lst.lib/lstOpen.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstOpen.c,v 1.12 2008/12/13 15:19:29 dsl Exp $ */
+/* $NetBSD: lstOpen.c,v 1.13 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstOpen.c,v 1.12 2008/12/13 15:19:29 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstOpen.c,v 1.13 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstOpen.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstOpen.c,v 1.12 2008/12/13 15:19:29 dsl Exp $");
+__RCSID("$NetBSD: lstOpen.c,v 1.13 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -76,12 +76,11 @@ ReturnStatus
Lst_Open(Lst l)
{
if (LstValid (l) == FALSE) {
- return (FAILURE);
+ return FAILURE;
}
(l)->isOpen = TRUE;
(l)->atEnd = LstIsEmpty (l) ? Head : Unknown;
(l)->curPtr = NULL;
- return (SUCCESS);
+ return SUCCESS;
}
-
Index: src/usr.bin/make/lst.lib/lstForEachFrom.c
diff -u src/usr.bin/make/lst.lib/lstForEachFrom.c:1.17 src/usr.bin/make/lst.lib/lstForEachFrom.c:1.18
--- src/usr.bin/make/lst.lib/lstForEachFrom.c:1.17 Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/lst.lib/lstForEachFrom.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstForEachFrom.c,v 1.17 2009/01/23 21:26:30 dsl Exp $ */
+/* $NetBSD: lstForEachFrom.c,v 1.18 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstForEachFrom.c,v 1.17 2009/01/23 21:26:30 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstForEachFrom.c,v 1.18 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstForEachFrom.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstForEachFrom.c,v 1.17 2009/01/23 21:26:30 dsl Exp $");
+__RCSID("$NetBSD: lstForEachFrom.c,v 1.18 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -122,4 +122,3 @@ Lst_ForEachFrom(Lst l, LstNode ln, int (
return result;
}
-
Index: src/usr.bin/make/lst.lib/lstPrev.c
diff -u src/usr.bin/make/lst.lib/lstPrev.c:1.3 src/usr.bin/make/lst.lib/lstPrev.c:1.4
--- src/usr.bin/make/lst.lib/lstPrev.c:1.3 Sat Dec 13 15:19:29 2008
+++ src/usr.bin/make/lst.lib/lstPrev.c Fri Jul 3 08:37:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lstPrev.c,v 1.3 2008/12/13 15:19:29 dsl Exp $ */
+/* $NetBSD: lstPrev.c,v 1.4 2020/07/03 08:37:57 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -33,14 +33,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lstPrev.c,v 1.3 2008/12/13 15:19:29 dsl Exp $";
+static char rcsid[] = "$NetBSD: lstPrev.c,v 1.4 2020/07/03 08:37:57 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)lstSucc.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: lstPrev.c,v 1.3 2008/12/13 15:19:29 dsl Exp $");
+__RCSID("$NetBSD: lstPrev.c,v 1.4 2020/07/03 08:37:57 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -73,7 +73,6 @@ Lst_Prev(LstNode ln)
if (ln == NULL) {
return NULL;
} else {
- return (ln->prevPtr);
+ return ln->prevPtr;
}
}
-
