Changeset 86ffa27f in mainline for uspace/lib/c/generic/rtld/symbol.c

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/generic/rtld/symbol.c (modified) (6 diffs)

uspace/lib/c/generic/rtld/symbol.c

@@ -38 +38 @@
 #include <stdlib.h>
 
+#include <elf/elf.h>
 #include <rtld/rtld.h>
 #include <rtld/rtld_debug.h>
 #include <rtld/symbol.h>
-#include <elf.h>
 
 /*
@@ -118 +118 @@
         module_t *m, *dm;
         elf_symbol_t *sym, *s;
-        link_t queue_head;
+        list_t queue;
         size_t i;
 
@@ -132 +132 @@
 
         /* Insert root (the program) into the queue and tag it */
-        list_initialize(&queue_head);
+        list_initialize(&queue);
         start->bfs_tag = true;
-        list_append(&start->queue_link, &queue_head);
+        list_append(&start->queue_link, &queue);
 
         /* If the symbol is found, it will be stored in 'sym' */
@@ -140 +140 @@
 
         /* While queue is not empty */
-        while (!list_empty(&queue_head)) {
+        while (!list_empty(&queue)) {
                 /* Pop first element from the queue */
-                m = list_get_instance(queue_head.next, module_t, queue_link);
+                m = list_get_instance(list_first(&queue), module_t, queue_link);
                 list_remove(&m->queue_link);
 
@@ -162 +162 @@
                         if (dm->bfs_tag == false) {
                                 dm->bfs_tag = true;
-                                list_append(&dm->queue_link, &queue_head);
+                                list_append(&dm->queue_link, &queue);
                         }
                 }
@@ -168 +168 @@
 
         /* Empty the queue so that we leave it in a clean state */
-        while (!list_empty(&queue_head))
-                list_remove(queue_head.next);
+        while (!list_empty(&queue))
+                list_remove(list_first(&queue));
 
         if (!sym) {