This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-cpputests in repository https://gitbox.apache.org/repos/asf/celix.git
commit 7a9bae954eb145306c2acbff12b8dbdc5261ad1d Author: Pepijn Noltes <[email protected]> AuthorDate: Thu Jan 4 14:16:48 2024 +0100 Remove unused linked_list source files --- libs/utils/src/linked_list.c | 269 ---------------------------------- libs/utils/src/linked_list_iterator.c | 154 ------------------- libs/utils/src/linked_list_private.h | 44 ------ 3 files changed, 467 deletions(-) diff --git a/libs/utils/src/linked_list.c b/libs/utils/src/linked_list.c deleted file mode 100644 index 3bb0db8f..00000000 --- a/libs/utils/src/linked_list.c +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/** - * linked_list.c - * - * \date Jul 16, 2010 - * \author <a href="mailto:[email protected]";>Apache Celix Project Team</a> - * \copyright Apache License, Version 2.0 - */ - -#include <stdbool.h> -#include <stdlib.h> - -#include "linked_list.h" -#include "linked_list_private.h" - - -celix_status_t linkedList_create(linked_list_pt *list) { - linked_list_pt linked_list = malloc(sizeof(*linked_list)); - if (linked_list) { - linked_list->header = (linked_list_entry_pt) malloc(sizeof(*(linked_list->header))); - if (linked_list->header) { - linked_list->header->element = NULL; - linked_list->header->next = linked_list->header; - linked_list->header->previous = linked_list->header; - linked_list->size = 0; - linked_list->modificationCount = 0; - - *list = linked_list; - - return CELIX_SUCCESS; - } - } - - return CELIX_ENOMEM; -} - -celix_status_t linkedList_destroy(linked_list_pt list) { - celix_status_t status = CELIX_SUCCESS; - - linked_list_entry_pt current = NULL; - linked_list_entry_pt next = NULL; - - current = list->header->next; - - while (current != list->header) { - next = current->next; - free(current); - current = next; - } - - free(list->header); - free(list); - - return status; -} - -celix_status_t linkedList_clone(linked_list_pt list, linked_list_pt *clone) { - celix_status_t status; - - status = linkedList_create(clone); - if (status == CELIX_SUCCESS) { - struct linked_list_entry *e; - for (e = list->header->next; e != list->header; e = e->next) { - linkedList_addElement(*clone, e->element); - } - } - - return status; -} - -void * linkedList_getFirst(linked_list_pt list) { - if (list->size == 0) { - return NULL; - } - return list->header->next->element; -} - -void * linkedList_getLast(linked_list_pt list) { - if (list->size == 0) { - return NULL; - } - return list->header->previous->element; -} - -void * linkedList_removeFirst(linked_list_pt list) { - return linkedList_removeEntry(list, list->header->next); -} - -void * linkedList_removeLast(linked_list_pt list) { - return linkedList_removeEntry(list, list->header->previous); -} - -void linkedList_addFirst(linked_list_pt list, void * element) { - linkedList_addBefore(list, element, list->header->next); -} - -void linkedList_addLast(linked_list_pt list, void * element) { - linkedList_addBefore(list, element, list->header); -} - -bool linkedList_contains(linked_list_pt list, void * element) { - return linkedList_indexOf(list, element) != -1; -} - -int linkedList_size(linked_list_pt list) { - return list->size; -} - -bool linkedList_isEmpty(linked_list_pt list) { - return linkedList_size(list) == 0; -} - -bool linkedList_addElement(linked_list_pt list, void * element) { - linkedList_addBefore(list, element, list->header); - return true; -} - -bool linkedList_removeElement(linked_list_pt list, void * element) { - if (element == NULL) { - linked_list_entry_pt entry; - for (entry = list->header->next; entry != list->header; entry = entry->next) { - if (entry->element == NULL) { - linkedList_removeEntry(list, entry); - return true; - } - } - } else { - linked_list_entry_pt entry; - for (entry = list->header->next; entry != list->header; entry = entry->next) { - if (element == entry->element) { - linkedList_removeEntry(list, entry); - return true; - } - } - } - return false; -} - -void linkedList_clear(linked_list_pt list) { - linked_list_entry_pt entry = list->header->next; - while (entry != list->header) { - linked_list_entry_pt next = entry->next; - entry->next = entry->previous = NULL; - // free(entry->element); - entry->element = NULL; - free(entry); - entry = next; - } - list->header->next = list->header->previous = list->header; - list->size = 0; - list->modificationCount++; -} - -void * linkedList_get(linked_list_pt list, int index) { - return linkedList_entry(list, index)->element; -} -void * linkedList_set(linked_list_pt list, int index, void * element) { - linked_list_entry_pt entry = linkedList_entry(list, index); - void * old = entry->element; - entry->element = element; - return old; -} - -void linkedList_addIndex(linked_list_pt list, int index, void * element) { - linkedList_addBefore(list, element, (index == list->size ? list->header : linkedList_entry(list, index))); -} - -void * linkedList_removeIndex(linked_list_pt list, int index) { - return linkedList_removeEntry(list, linkedList_entry(list, index)); -} - -linked_list_entry_pt linkedList_entry(linked_list_pt list, int index) { - linked_list_entry_pt entry; - int i; - if (index < 0 || index >= list->size) { - return NULL; - } - - entry = list->header; - if (index < (list->size >> 1)) { - for (i = 0; i <= index; i++) { - entry = entry->next; - } - } else { - for (i = list->size; i > index; i--) { - entry = entry->previous; - } - } - return entry; -} - -int linkedList_indexOf(linked_list_pt list, void * element) { - int index = 0; - if (element == NULL) { - linked_list_entry_pt entry; - for (entry = list->header->next; entry != list->header; entry = entry->next) { - if (entry->element == NULL) { - return index; - } - index++; - } - } else { - linked_list_entry_pt entry; - for (entry = list->header->next; entry != list->header; entry = entry->next) { - if (element == entry->element) { - return index; - } - index++; - } - } - return -1; -} - -linked_list_entry_pt linkedList_addBefore(linked_list_pt list, void * element, linked_list_entry_pt entry) { - linked_list_entry_pt new = NULL; - - new = malloc(sizeof(*new)); - if (new != NULL) { - - new->element = element; - new->next = entry; - new->previous = entry->previous; - - new->previous->next = new; - new->next->previous = new; - - list->size++; - list->modificationCount++; - } - - return new; -} - -void * linkedList_removeEntry(linked_list_pt list, linked_list_entry_pt entry) { - void * result; - if (entry == list->header) { - return NULL; - } - - result = entry->element; - - entry->previous->next = entry->next; - entry->next->previous = entry->previous; - - entry->next = entry->previous = NULL; - free(entry); - - list->size--; - list->modificationCount++; - - return result; -} diff --git a/libs/utils/src/linked_list_iterator.c b/libs/utils/src/linked_list_iterator.c deleted file mode 100644 index c42c3d25..00000000 --- a/libs/utils/src/linked_list_iterator.c +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/** - * linked_list_iterator.c - * - * \date Jul 16, 2010 - * \author <a href="mailto:[email protected]";>Apache Celix Project Team</a> - * \copyright Apache License, Version 2.0 - */ - -#include <stdio.h> -#include <stdlib.h> - -#include "linked_list_iterator.h" -#include "linked_list_private.h" - -struct linkedListIterator { - linked_list_entry_pt lastReturned; - linked_list_entry_pt next; - int nextIndex; - linked_list_pt list; - int expectedModificationCount; -}; - -linked_list_iterator_pt linkedListIterator_create(linked_list_pt list, unsigned int index) { - linked_list_iterator_pt iterator; - if (index > list->size) { - return NULL; - } - iterator = (linked_list_iterator_pt) malloc(sizeof(*iterator)); - iterator->lastReturned = list->header; - iterator->list = list; - iterator->expectedModificationCount = list->modificationCount; - if (index < (list->size >> 1)) { - iterator->next = iterator->list->header->next; - for (iterator->nextIndex = 0; iterator->nextIndex < index; iterator->nextIndex++) { - iterator->next = iterator->next->next; - } - } else { - iterator->next = list->header; - for (iterator->nextIndex = list->size; iterator->nextIndex > index; iterator->nextIndex--) { - iterator->next = iterator->next->previous; - } - } - return iterator; -} - -void linkedListIterator_destroy(linked_list_iterator_pt iterator) { - iterator->expectedModificationCount = 0; - iterator->lastReturned = NULL; - iterator->list = NULL; - iterator->next = NULL; - iterator->nextIndex = 0; - free(iterator); -} - -bool linkedListIterator_hasNext(linked_list_iterator_pt iterator) { - return iterator->nextIndex != iterator->list->size; -} - -void * linkedListIterator_next(linked_list_iterator_pt iterator) { - if (iterator->list->modificationCount != iterator->expectedModificationCount) { - return NULL; - } - if (iterator->nextIndex == iterator->list->size) { - return NULL; - } - iterator->lastReturned = iterator->next; - iterator->next = iterator->next->next; - iterator->nextIndex++; - return iterator->lastReturned->element; -} - -bool linkedListIterator_hasPrevious(linked_list_iterator_pt iterator) { - return iterator->nextIndex != 0; -} - -void * linkedListIterator_previous(linked_list_iterator_pt iterator) { - if (iterator->nextIndex == 0) { - return NULL; - } - - iterator->lastReturned = iterator->next = iterator->next->previous; - iterator->nextIndex--; - - if (iterator->list->modificationCount != iterator->expectedModificationCount) { - return NULL; - } - - return iterator->lastReturned->element; -} - -int linkedListIterator_nextIndex(linked_list_iterator_pt iterator) { - return iterator->nextIndex; -} - -int linkedListIterator_previousIndex(linked_list_iterator_pt iterator) { - return iterator->nextIndex-1; -} - -void linkedListIterator_remove(linked_list_iterator_pt iterator) { - linked_list_entry_pt lastNext; - if (iterator->list->modificationCount != iterator->expectedModificationCount) { - return; - } - lastNext = iterator->lastReturned->next; - if (linkedList_removeEntry(iterator->list, iterator->lastReturned) == NULL) { - return; - } - if (iterator->next == iterator->lastReturned) { - iterator->next = lastNext; - } else { - iterator->nextIndex--; - } - iterator->lastReturned = iterator->list->header; - iterator->expectedModificationCount++; -} - -void linkedListIterator_set(linked_list_iterator_pt iterator, void * element) { - if (iterator->lastReturned == iterator->list->header) { - return; - } - if (iterator->list->modificationCount != iterator->expectedModificationCount) { - return; - } - iterator->lastReturned->element = element; -} - -void linkedListIterator_add(linked_list_iterator_pt iterator, void * element) { - if (iterator->list->modificationCount != iterator->expectedModificationCount) { - return; - } - iterator->lastReturned = iterator->list->header; - linkedList_addBefore(iterator->list, element, iterator->next); - iterator->nextIndex++; - iterator->expectedModificationCount++; -} - diff --git a/libs/utils/src/linked_list_private.h b/libs/utils/src/linked_list_private.h deleted file mode 100644 index e80026aa..00000000 --- a/libs/utils/src/linked_list_private.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/** - * linked_list_private.h - * - * \date Jul 16, 2010 - * \author <a href="mailto:[email protected]";>Apache Celix Project Team</a> - * \copyright Apache License, Version 2.0 - */ - -#ifndef LINKED_LIST_PRIVATE_H_ -#define LINKED_LIST_PRIVATE_H_ - -#include "linked_list.h" - -struct linked_list_entry { - void * element; - struct linked_list_entry * next; - struct linked_list_entry * previous; -}; - -struct linked_list { - linked_list_entry_pt header; - size_t size; - int modificationCount; -}; - -#endif /* LINKED_LIST_PRIVATE_H_ */
