Changes in uspace/lib/gui/connection.c [10cb47e:6d5e378] in mainline

File:

• uspace/lib/gui/connection.c (modified) (8 diffs)

uspace/lib/gui/connection.c

@@ -65 +65 @@
 
         signal_node_t *sig_node = NULL;
-        list_foreach(connection_list, link, signal_node_t, cur) {
+        list_foreach(connection_list, link) {
+                signal_node_t *cur = list_get_instance(link, signal_node_t, link);
                 if (cur->signal == signal) {
                         sig_node = cur;
@@ -87 +88 @@
 
         slot_node_t *slt_node = NULL;
-        list_foreach(sig_node->slots, link, slot_node_t, cur) {
+        list_foreach(sig_node->slots, link) {
+                slot_node_t *cur = list_get_instance(link, slot_node_t, link);
                 if (cur->widget == widget && cur->slot == slot) {
                         slt_node = cur;
@@ -119 +121 @@
 
         signal_node_t *sig_node = NULL;
-        list_foreach(connection_list, link, signal_node_t, cur) {
+        list_foreach(connection_list, link) {
+                signal_node_t *cur = list_get_instance(link, signal_node_t, link);
                 if (cur->signal == signal) {
                         sig_node = cur;
@@ -132 +135 @@
 
         slot_node_t *slt_node = NULL;
-        list_foreach(sig_node->slots, link, slot_node_t, cur) {
+        list_foreach(sig_node->slots, link) {
+                slot_node_t *cur = list_get_instance(link, slot_node_t, link);
                 if (cur->widget == widget && cur->slot == slot) {
                         slt_node = cur;
@@ -160 +164 @@
 
         signal_node_t *sig_node = NULL;
-        list_foreach(connection_list, link, signal_node_t, cur) {
+        list_foreach(connection_list, link) {
+                signal_node_t *cur = list_get_instance(link, signal_node_t, link);
                 if (cur->signal == signal) {
                         sig_node = cur;
@@ -172 +177 @@
         }
 
-        list_foreach(sig_node->slots, link, slot_node_t, cur) {
+        list_foreach(sig_node->slots, link) {
+                slot_node_t *cur = list_get_instance(link, slot_node_t, link);
                 cur->slot(cur->widget, data);
         }
@@ -184 +190 @@
 
         signal_node_t *sig_node = NULL;
-        list_foreach(connection_list, link, signal_node_t, cur) {
+        list_foreach(connection_list, link) {
+                signal_node_t *cur = list_get_instance(link, signal_node_t, link);
                 if (cur->signal == signal) {
                         sig_node = cur;
@@ -196 +203 @@
         }
 
-        list_foreach(sig_node->slots, link, slot_node_t, cur) {
+        list_foreach(sig_node->slots, link) {
+                slot_node_t *cur = list_get_instance(link, slot_node_t, link);
+
                 void *data_copy = NULL;
-                if (data != NULL)
+                if (data != NULL) {
                         data_copy = malloc(data_size);
-                
-                if (data_copy != NULL)
+                }
+                if (data_copy != NULL) {
                         memcpy(data_copy, data, data_size);
-                
+                }
                 window_event_t *event =
-                    (window_event_t *) malloc(sizeof(window_event_t));
-                
+                        (window_event_t *) malloc(sizeof(window_event_t));
+
                 if (event) {
                         link_initialize(&event->link);
                         event->type = ET_SIGNAL_EVENT;
-                        event->data.signal.object = (sysarg_t) cur->widget;
-                        event->data.signal.slot = (sysarg_t) cur->slot;
-                        event->data.signal.argument = (sysarg_t) data_copy;
+                        event->data.sig.object = (sysarg_t) cur->widget;
+                        event->data.sig.slot = (sysarg_t) cur->slot;
+                        event->data.sig.argument = (sysarg_t) data_copy;
                         prodcons_produce(&cur->widget->window->events, &event->link);
                 } else {
-                        if (data_copy != NULL)
+                        if (data_copy != NULL) {
                                 free(data_copy);
+                        }
                 }
         }