opkg: implement active_list_prev and test cases.

git-svn-id: http://opkg.googlecode.com/svn/trunk@169 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libopkg/active_list.c b/libopkg/active_list.c
index 800915df0ff8fdf8cf205651cb1247010b4d02c4..e297cfca4d7a63b6bcc5eecbef29a9605248f6c2 100644 (file)
--- a/libopkg/active_list.c
+++ b/libopkg/active_list.c
@@ -30,26 +30,47 @@ void active_list_init(struct active_list *ptr) {
  */ 
 struct active_list * active_list_next(struct active_list *head, struct active_list *ptr) {
     struct active_list *next=NULL;
-    if (!head) {
-        fprintf(stderr, "active_list_prev head = %p, ptr = %p invalid value!!\n", head, ptr);
+    if ( !head ) {
+        fprintf(stderr, "active_list_next head = %p, ptr = %p invalid value!!\n", head, ptr);
         return NULL;
     }
-    if (!ptr)
+    if ( !ptr )
         ptr = head;
     next = list_entry(ptr->node.next, struct active_list, node);
-    if (next == head ) {
+    if ( next == head ) {
         return NULL;
     }
-    if (ptr->depended && &ptr->depended->depend == ptr->node.next ) {
+    if ( ptr->depended && &ptr->depended->depend == ptr->node.next ) {
         return ptr->depended;
     }
-    while (next->depend.next != &next->depend) {
+    while ( next->depend.next != &next->depend ) {
         next = list_entry(next->depend.next, struct active_list, node); 
     }
     return next;
 }
 
 
+struct active_list * active_list_prev(struct active_list *head, struct active_list *ptr) {
+    struct active_list *prev=NULL;
+    if ( !head ) {
+        fprintf(stderr, "active_list_prev head = %p, ptr = %p invalid value!!\n", head, ptr);
+        return NULL;
+    }
+    if ( !ptr )
+        ptr = head;
+    if ( ptr->depend.prev != &ptr->depend ) {
+        prev = list_entry(ptr->depend.prev, struct active_list, node);
+        return prev;
+    } 
+    if ( ptr->depended  && ptr->depended != head && &ptr->depended->depend == ptr->node.prev ) {
+        prev = list_entry(ptr->depended->node.prev, struct active_list, node);
+    } else 
+        prev = list_entry(ptr->node.prev, struct active_list, node);
+    if ( prev == head )
+        return NULL;
+    return prev;
+}
+
 void active_list_clear(struct active_list *head) {
 }
 

diff --git a/libopkg/active_list.h b/libopkg/active_list.h
index 79ab77d5fc9abb60a130f11b335d3847b54ff76b..262164abac886cdae9f54e1fd051566bd1a137e3 100644 (file)
--- a/libopkg/active_list.h
+++ b/libopkg/active_list.h
@@ -26,10 +26,13 @@ struct active_list {
     struct active_list *depended;
 };
 
-struct active_list * active_list_next(struct active_list *head, struct active_list *ptr);
 void active_list_init(struct active_list *ptr);
 void active_list_clear(struct active_list *head);
 void active_list_add_depend(struct active_list *node, struct active_list *depend);
 void active_list_add(struct active_list *head, struct active_list *node);
 
+struct active_list * active_list_next(struct active_list *head, struct active_list *ptr);
+
+struct active_list * active_list_prev(struct active_list *head, struct active_list *ptr);
+
 #endif

diff --git a/tests/opkg_active_list_test.c b/tests/opkg_active_list_test.c
index f7bd390e181b9ffd68d8e644f1a548fbea2ee021..1e216450fe8d3700359512d8da9308e313f6eaea 100644 (file)
--- a/tests/opkg_active_list_test.c
+++ b/tests/opkg_active_list_test.c
@@ -48,7 +48,8 @@ void active_test_add_depend(struct active_test *A, struct active_test *B) {
              |_M      |_O
 
 Then the sequence will be 
-G M H I O J A B K N L C D E F
++: G M H I O J A B K N L C D E F
+-: F E D C L N K B A J O I H M G
 */
 void make_list(struct active_list *head) {
     struct active_test *A = active_test_new("A");
@@ -100,16 +101,17 @@ int main (void) {
     active_list_init(&head);
     make_list(&head);
 
+    printf("pos order: ");
     for(ptr = active_list_next(&head, &head); ptr ;ptr = active_list_next(&head, ptr)) {
         test = list_entry(ptr, struct active_test, list);
         printf ("%s ",test->str);
     }
-    printf("\n");
-    for(ptr = active_list_next(&head, &head); ptr ;ptr = active_list_next(&head, ptr)) {
+    printf("\nneg order: ");
+    for(ptr = active_list_prev(&head, &head); ptr ;ptr = active_list_prev(&head, ptr)) {
         test = list_entry(ptr, struct active_test, list);
         printf ("%s ",test->str);
     }
-    printf("\n");
+    printf("\npos order: ");
     for(ptr = active_list_next(&head, NULL); ptr ;ptr = active_list_next(&head, ptr)) {
         test = list_entry(ptr, struct active_test, list);
         printf ("%s ",test->str);