Changeset 00c2de63 in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2011-07-29T14:50:22Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

b6759f4

Parents:

6c69d19 (diff), 7ae249d (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 libposix.

File:

• uspace/lib/c/generic/rtld/module.c (modified) (7 diffs)

uspace/lib/c/generic/rtld/module.c

@@ -35 +35 @@
  */
 
+#include <adt/list.h>
+#include <elf/elf_load.h>
+#include <fcntl.h>
+#include <loader/pcb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <adt/list.h>
-#include <loader/pcb.h>
 
 #include <rtld/rtld.h>
@@ -47 +48 @@
 #include <rtld/rtld_arch.h>
 #include <rtld/module.h>
-#include <elf_load.h>
 
 /** (Eagerly) process all relocation tables in a module.
@@ -93 +93 @@
 module_t *module_find(const char *name)
 {
-        link_t *head = &runtime_env->modules_head;
-
-        link_t *cur;
         module_t *m;
         const char *p, *soname;
@@ -110 +107 @@
 
         /* Traverse list of all modules. Not extremely fast, but simple */
-        DPRINTF("head = %p\n", head);
-        for (cur = head->next; cur != head; cur = cur->next) {
+        list_foreach(runtime_env->modules, cur) {
                 DPRINTF("cur = %p\n", cur);
                 m = list_get_instance(cur, module_t, modules_link);
@@ -177 +173 @@
 
         /* Insert into the list of loaded modules */
-        list_append(&m->modules_link, &runtime_env->modules_head);
+        list_append(&m->modules_link, &runtime_env->modules);
 
         return m;
@@ -249 +245 @@
 void modules_process_relocs(module_t *start)
 {
-        link_t *head = &runtime_env->modules_head;
-
-        link_t *cur;
-        module_t *m;
-
-        for (cur = head->next; cur != head; cur = cur->next) {
+        module_t *m;
+
+        list_foreach(runtime_env->modules, cur) {
                 m = list_get_instance(cur, module_t, modules_link);
 
@@ -268 +261 @@
 void modules_untag(void)
 {
-        link_t *head = &runtime_env->modules_head;
-
-        link_t *cur;
-        module_t *m;
-
-        for (cur = head->next; cur != head; cur = cur->next) {
+        module_t *m;
+
+        list_foreach(runtime_env->modules, cur) {
                 m = list_get_instance(cur, module_t, modules_link);
                 m->bfs_tag = false;