SLinkedList: add the list pointer argument to Next and Prev functions

structure/SLinkedList_decl.h

@@ -41,12 +41,12 @@ typedef struct {
     SLinkedListEntry *next;
 } SLinkedListNode;
 
-static SLinkedListEntry * SLinkedListNext (SLinkedListEntry *entry);
-static SLinkedListEntry * SLinkedListPrev (SLinkedListEntry *entry);
 static void SLinkedListMarkRemoved (SLinkedListEntry *entry);
 static int SLinkedListIsRemoved (SLinkedListEntry *entry);
 
 static void SLinkedList_Init (SLinkedList *o);
+static SLinkedListEntry * SLinkedList_Next (SLinkedList *o, SLinkedListEntry *entry);
+static SLinkedListEntry * SLinkedList_Prev (SLinkedList *o, SLinkedListEntry *entry);
 static void SLinkedList_Prepend (SLinkedList *o, SLinkedListEntry *entry);
 #if SLINKEDLIST_PARAM_FEATURE_LAST
 static void SLinkedList_Append (SLinkedList *o, SLinkedListEntry *entry);

structure/SLinkedList_footer.h

@@ -36,12 +36,12 @@
 #undef SLinkedListEntry
 #undef SLinkedListNode
 
-#undef SLinkedListNext
-#undef SLinkedListPrev
 #undef SLinkedListMarkRemoved
 #undef SLinkedListIsRemoved
 
 #undef SLinkedList_Init
+#undef SLinkedList_Next
+#undef SLinkedList_Prev
 #undef SLinkedList_Prepend
 #undef SLinkedList_Append
 #undef SLinkedList_InsertBefore

structure/SLinkedList_header.h

@@ -39,13 +39,13 @@
 #define SLinkedListNode MERGE(SLinkedList, Node)
 
 // non-object public functions
-#define SLinkedListNext MERGE(SLinkedList, Next)
-#define SLinkedListPrev MERGE(SLinkedList, Prev)
 #define SLinkedListMarkRemoved MERGE(SLinkedList, MarkRemoved)
 #define SLinkedListIsRemoved MERGE(SLinkedList, IsRemoved)
 
 // public functions
 #define SLinkedList_Init MERGE(SLinkedList, _Init)
+#define SLinkedList_Next MERGE(SLinkedList, _Next)
+#define SLinkedList_Prev MERGE(SLinkedList, _Prev)
 #define SLinkedList_Prepend MERGE(SLinkedList, _Prepend)
 #define SLinkedList_Append MERGE(SLinkedList, _Append)
 #define SLinkedList_InsertBefore MERGE(SLinkedList, _InsertBefore)

structure/SLinkedList_impl.h

@@ -29,20 +29,6 @@
 
 #include "SLinkedList_header.h"
 
-static SLinkedListEntry * SLinkedListNext (SLinkedListEntry *entry)
-{
-    ASSERT(entry)
-    
-    return SLinkedList_next(entry);
-}
-
-static SLinkedListEntry * SLinkedListPrev (SLinkedListEntry *entry)
-{
-    ASSERT(entry)
-    
-    return SLinkedList_prev(entry);
-}
-
 static void SLinkedListMarkRemoved (SLinkedListEntry *entry)
 {
     ASSERT(entry)
@@ -65,6 +51,20 @@ static void SLinkedList_Init (SLinkedList *o)
 #endif
 }
 
+static SLinkedListEntry * SLinkedList_Next (SLinkedList *o, SLinkedListEntry *entry)
+{
+    ASSERT(entry)
+    
+    return SLinkedList_next(entry);
+}
+
+static SLinkedListEntry * SLinkedList_Prev (SLinkedList *o, SLinkedListEntry *entry)
+{
+    ASSERT(entry)
+    
+    return SLinkedList_prev(entry);
+}
+
 static void SLinkedList_Prepend (SLinkedList *o, SLinkedListEntry *entry)
 {
     ASSERT(entry)