summaryrefslogtreecommitdiffstats
path: root/usr.bin/make/lst.lib
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/make/lst.lib')
-rw-r--r--usr.bin/make/lst.lib/lstAppend.c4
-rw-r--r--usr.bin/make/lst.lib/lstConcat.c5
-rw-r--r--usr.bin/make/lst.lib/lstDeQueue.c4
-rw-r--r--usr.bin/make/lst.lib/lstDestroy.c10
-rw-r--r--usr.bin/make/lst.lib/lstDupl.c6
-rw-r--r--usr.bin/make/lst.lib/lstFindFrom.c4
-rw-r--r--usr.bin/make/lst.lib/lstForEachFrom.c8
-rw-r--r--usr.bin/make/lst.lib/lstInsert.c4
-rw-r--r--usr.bin/make/lst.lib/lstIsAtEnd.c2
-rw-r--r--usr.bin/make/lst.lib/lstNext.c2
-rw-r--r--usr.bin/make/lst.lib/lstOpen.c4
-rw-r--r--usr.bin/make/lst.lib/lstRemove.c2
12 files changed, 28 insertions, 27 deletions
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index 9ff3f86..f18cee4 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -75,11 +75,11 @@ Lst_Append(Lst list, LstNode ln, void *d)
{
LstNode nLNode;
- if (Lst_Valid (list) && (ln == NULL && Lst_IsEmpty (list))) {
+ if (Lst_Valid(list) && (ln == NULL && Lst_IsEmpty(list))) {
goto ok;
}
- if (!Lst_Valid (list) || Lst_IsEmpty (list) || ! Lst_NodeValid(ln, list)) {
+ if (!Lst_Valid(list) || Lst_IsEmpty(list) || ! Lst_NodeValid(ln, list)) {
return (FAILURE);
}
ok:
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index 330425f..f0c771c 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -79,7 +79,8 @@ Lst_Concat(Lst list1, Lst list2, int flags)
LstNode nln; /* new LstNode */
LstNode last; /* the last element in the list. Keeps
* bookkeeping until the end */
- if (!Lst_Valid (list1) || !Lst_Valid (list2)) {
+
+ if (!Lst_Valid(list1) || !Lst_Valid(list2)) {
return (FAILURE);
}
@@ -119,7 +120,7 @@ Lst_Concat(Lst list1, Lst list2, int flags)
list1->firstPtr->prevPtr = list1->lastPtr;
list1->lastPtr->nextPtr = list1->firstPtr;
}
- free (list2);
+ free(list2);
} else if (list2->firstPtr != NULL) {
/*
* We set the nextPtr of the last element of list 2 to be NULL to make
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index 7cfb476..86a57de 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -69,13 +69,13 @@ Lst_DeQueue(Lst l)
void * rd;
LstNode tln;
- tln = Lst_First (l);
+ tln = Lst_First(l);
if (tln == NULL) {
return (NULL);
}
rd = tln->datum;
- if (Lst_Remove (l, tln) == FAILURE) {
+ if (Lst_Remove(l, tln) == FAILURE) {
return (NULL);
} else {
return (rd);
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index 2a43c1d..5b9dc24 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -82,22 +82,22 @@ Lst_Destroy(Lst list, FreeProc *freeProc)
if (list->lastPtr != NULL)
list->lastPtr->nextPtr = NULL;
else {
- free (list);
+ free(list);
return;
}
if (freeProc) {
for (ln = list->firstPtr; ln != NULL; ln = tln) {
tln = ln->nextPtr;
- (*freeProc) (ln->datum);
- free (ln);
+ (*freeProc)(ln->datum);
+ free(ln);
}
} else {
for (ln = list->firstPtr; ln != NULL; ln = tln) {
tln = ln->nextPtr;
- free (ln);
+ free(ln);
}
}
- free (list);
+ free(list);
}
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index 58f3f56..07d4011 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -73,11 +73,11 @@ Lst_Duplicate(Lst list, DuplicateProc *copyProc)
Lst nl;
LstNode ln;
- if (!Lst_Valid (list)) {
+ if (!Lst_Valid(list)) {
return (NULL);
}
- nl = Lst_Init (list->isCirc);
+ nl = Lst_Init(list->isCirc);
if (nl == NULL) {
return (NULL);
}
@@ -85,7 +85,7 @@ Lst_Duplicate(Lst list, DuplicateProc *copyProc)
ln = list->firstPtr;
while (ln != NULL) {
if (copyProc != NOCOPY) {
- if (Lst_AtEnd (nl, (*copyProc) (ln->datum)) == FAILURE) {
+ if (Lst_AtEnd(nl, (*copyProc)(ln->datum)) == FAILURE) {
return (NULL);
}
} else if (Lst_AtEnd (nl, ln->datum) == FAILURE) {
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 557048b..e8f0ac5 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -70,14 +70,14 @@ Lst_FindFrom(Lst l, LstNode ln, void *d, CompareProc *cProc)
LstNode tln;
Boolean found = FALSE;
- if (!Lst_Valid (l) || Lst_IsEmpty (l) || !Lst_NodeValid (ln, l)) {
+ if (!Lst_Valid(l) || Lst_IsEmpty(l) || !Lst_NodeValid(ln, l)) {
return (NULL);
}
tln = ln;
do {
- if ((*cProc) (tln->datum, d) == 0) {
+ if ((*cProc)(tln->datum, d) == 0) {
found = TRUE;
break;
} else {
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 69742d0..b95741a 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -72,7 +72,7 @@ Lst_ForEachFrom(Lst list, LstNode ln, DoProc *proc, void *d)
Boolean done;
int result;
- if (!Lst_Valid (list) || Lst_IsEmpty (list)) {
+ if (!Lst_Valid(list) || Lst_IsEmpty(list)) {
return;
}
@@ -84,9 +84,9 @@ Lst_ForEachFrom(Lst list, LstNode ln, DoProc *proc, void *d)
next = ln->nextPtr;
- (void) ln->useCount++;
- result = (*proc) (ln->datum, d);
- (void) ln->useCount--;
+ ln->useCount++;
+ result = (*proc)(ln->datum, d);
+ ln->useCount--;
/*
* We're done with the traversal if
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 486565e..160ace3 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -76,10 +76,10 @@ Lst_Insert(Lst list, LstNode ln, void *d)
/*
* check validity of arguments
*/
- if (Lst_Valid (list) && (Lst_IsEmpty (list) && ln == NULL))
+ if (Lst_Valid(list) && (Lst_IsEmpty(list) && ln == NULL))
goto ok;
- if (!Lst_Valid (list) || Lst_IsEmpty (list) || !Lst_NodeValid (ln, list)) {
+ if (!Lst_Valid(list) || Lst_IsEmpty(list) || !Lst_NodeValid(ln, list)) {
return (FAILURE);
}
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 5f42b70..f8881f0 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -77,6 +77,6 @@ Boolean
Lst_IsAtEnd(Lst list)
{
- return (!Lst_Valid (list) || !list->isOpen ||
+ return (!Lst_Valid(list) || !list->isOpen ||
(list->atEnd == LstHead) || (list->atEnd == LstTail));
}
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index db112c5..5d388af 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -74,7 +74,7 @@ Lst_Next(Lst list)
{
LstNode tln;
- if ((Lst_Valid (list) == FALSE) || (list->isOpen == FALSE)) {
+ if ((Lst_Valid(list) == FALSE) || (list->isOpen == FALSE)) {
return (NULL);
}
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index 11559ab..06ba566 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -73,11 +73,11 @@ ReturnStatus
Lst_Open(Lst l)
{
- if (Lst_Valid (l) == FALSE) {
+ if (Lst_Valid(l) == FALSE) {
return (FAILURE);
}
l->isOpen = TRUE;
- l->atEnd = Lst_IsEmpty (l) ? LstHead : LstUnknown;
+ l->atEnd = Lst_IsEmpty(l) ? LstHead : LstUnknown;
l->curPtr = NULL;
return (SUCCESS);
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index 5da603f..d11fcea 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -68,7 +68,7 @@ ReturnStatus
Lst_Remove(Lst list, LstNode ln)
{
- if (!Lst_Valid (list) || !Lst_NodeValid (ln, list)) {
+ if (!Lst_Valid(list) || !Lst_NodeValid(ln, list)) {
return (FAILURE);
}
OpenPOWER on IntegriCloud