From 9fb3e42acb02f376359f9996f1810b01f8eb872f Mon Sep 17 00:00:00 2001 From: Dave Mercer Date: Tue, 9 Jan 2024 11:22:15 -0500 Subject: [PATCH 1/2] renaming new param in list_insert_node to newNode --- include/utils/list.h | 2 +- src/list.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/utils/list.h b/include/utils/list.h index 9da005e..adb0980 100644 --- a/include/utils/list.h +++ b/include/utils/list.h @@ -39,7 +39,7 @@ int list_popleft(list_t *list, node_t **node); void list_remove_node(list_t *list, node_t *node); int list_remove_nodes(list_t *list, node_t *start, node_t *end); -void list_insert_node(list_t *list, node_t *after, node_t *new); +void list_insert_node(list_t *list, node_t *after, node_t *newNode); int list_insert_nodes(list_t *list, node_t *after, node_t *start, node_t *end); /*--- singly-linked list ---*/ diff --git a/src/list.c b/src/list.c index c4e49af..c3f5c1a 100644 --- a/src/list.c +++ b/src/list.c @@ -160,21 +160,21 @@ int list_remove_nodes(list_t *list, node_t *start, node_t *end) return 0; } -void list_insert_node(list_t *list, node_t *after, node_t *new) +void list_insert_node(list_t *list, node_t *after, node_t *newNode) { node_t *next; if (after == NULL) { /* insert at head */ next = list->head; - list->head = new; + list->head = newNode; } else { next = after->next; - after->next = new; + after->next = newNode; } - new->prev = after; - new->next = next; - next->prev = new; + newNode->prev = after; + newNode->next = next; + next->prev = newNode; } int list_insert_nodes(list_t *list, node_t *after, node_t *start, node_t *end) From ed8d17eea6bb469f500ddc5ce9d228983f377d0d Mon Sep 17 00:00:00 2001 From: Dave Mercer Date: Tue, 9 Jan 2024 11:40:32 -0500 Subject: [PATCH 2/2] renaming new param in slist_insert_node to newNode --- include/utils/list.h | 2 +- src/list.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/utils/list.h b/include/utils/list.h index adb0980..02ed96a 100644 --- a/include/utils/list.h +++ b/include/utils/list.h @@ -63,7 +63,7 @@ int slist_pop(slist_t *list, snode_t *after, snode_t **node); int slist_popleft(slist_t *list, snode_t **node); int slist_remove_node(slist_t *list, snode_t *node); -void slist_insert_node(slist_t *list, snode_t *after, snode_t *new); +void slist_insert_node(slist_t *list, snode_t *after, snode_t *newNode); #ifdef __cplusplus } diff --git a/src/list.c b/src/list.c index c3f5c1a..065d147 100644 --- a/src/list.c +++ b/src/list.c @@ -288,15 +288,15 @@ int slist_remove_node(slist_t *list, snode_t *node) return 0; } -void slist_insert_node(slist_t *list, snode_t *after, snode_t *new) +void slist_insert_node(slist_t *list, snode_t *after, snode_t *newNode) { if (after == NULL) { /* same as append left */ - new->next = list->head; - list->head = new; + newNode->next = list->head; + list->head = newNode; } else { /* assert after in list here? */ - new->next = after->next; - after->next = new; + newNode->next = after->next; + after->next = newNode; } }