Changeset 0c2d9bb in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/module.c (modified) (4 diffs)

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

@@ -93 +93 @@
 module_t *module_find(const char *name)
 {
-        module_t *m;
         const char *p, *soname;
 
@@ -107 +106 @@
 
         /* Traverse list of all modules. Not extremely fast, but simple */
-        list_foreach(runtime_env->modules, cur) {
-                DPRINTF("cur = %p\n", cur);
-                m = list_get_instance(cur, module_t, modules_link);
+        list_foreach(runtime_env->modules, modules_link, module_t, m) {
+                DPRINTF("m = %p\n", m);
                 if (str_cmp(m->dyn.soname, soname) == 0) {
                         return m; /* Found */
@@ -245 +243 @@
 void modules_process_relocs(module_t *start)
 {
-        module_t *m;
-
-        list_foreach(runtime_env->modules, cur) {
-                m = list_get_instance(cur, module_t, modules_link);
-
+        list_foreach(runtime_env->modules, modules_link, module_t, m) {
                 /* Skip rtld, since it has already been processed */
                 if (m != &runtime_env->rtld) {
@@ -261 +255 @@
 void modules_untag(void)
 {
-        module_t *m;
-
-        list_foreach(runtime_env->modules, cur) {
-                m = list_get_instance(cur, module_t, modules_link);
+        list_foreach(runtime_env->modules, modules_link, module_t, m) {
                 m->bfs_tag = false;
         }