Changeset 0c2d9bb in mainline for uspace/lib/graph/graph.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/graph/graph.c (modified) (5 diffs)

uspace/lib/graph/graph.c

@@ -165 +165 @@
 
         fibril_mutex_lock(&visualizer_list_mtx);
-        list_foreach(visualizer_list, link) {
-                visualizer_t *cur = list_get_instance(link, visualizer_t, link);
-                if (cur->reg_svc_handle == handle) {
-                        vs = cur;
+        list_foreach(visualizer_list, link, visualizer_t, vcur) {
+                if (vcur->reg_svc_handle == handle) {
+                        vs = vcur;
                         break;
                 }
@@ -182 +181 @@
 
         fibril_mutex_lock(&renderer_list_mtx);
-        list_foreach(renderer_list, link) {
-                renderer_t *cur = list_get_instance(link, renderer_t, link);
-                if (cur->reg_svc_handle == handle) {
-                        rnd = cur;
+        list_foreach(renderer_list, link, renderer_t, rcur) {
+                if (rcur->reg_svc_handle == handle) {
+                        rnd = rcur;
                         break;
                 }
@@ -322 +320 @@
         fibril_mutex_lock(&vs->mode_mtx);
         vslmode_list_element_t *mode_elem = NULL;
-        list_foreach(vs->modes, link) {
-                vslmode_list_element_t *cur = list_get_instance(link, vslmode_list_element_t, link);
+        list_foreach(vs->modes, link, vslmode_list_element_t, cur) {
                 if (cur->mode.index == vs->def_mode_idx) {
                         mode_elem = cur;
@@ -382 +379 @@
         fibril_mutex_lock(&vs->mode_mtx);
         vslmode_list_element_t *mode_elem = NULL;
-        list_foreach(vs->modes, link) {
-                vslmode_list_element_t *cur = list_get_instance(link, vslmode_list_element_t, link);
+        list_foreach(vs->modes, link, vslmode_list_element_t, cur) {
                 if (cur->mode.index == mode_idx) {
                         mode_elem = cur;
@@ -425 +421 @@
         fibril_mutex_lock(&vs->mode_mtx);
         vslmode_list_element_t *mode_elem = NULL;
-        list_foreach(vs->modes, link) {
-                vslmode_list_element_t *cur = list_get_instance(link, vslmode_list_element_t, link);
+        list_foreach(vs->modes, link, vslmode_list_element_t, cur) {
                 if (cur->mode.index == mode_idx) {
                         mode_elem = cur;