Changeset f126c87 in mainline for uspace/lib/gui/connection.c

Timestamp:

2016-09-01T16:46:27Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 from mainline.

File:

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

uspace/lib/gui/connection.c

@@ -198 +198 @@
         list_foreach(sig_node->slots, link, slot_node_t, cur) {
                 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);
@@ -215 +215 @@
                         prodcons_produce(&cur->widget->window->events, &event->link);
                 } else {
-                        if (data_copy != NULL) {
+                        if (data_copy != NULL)
                                 free(data_copy);
-                        }
                 }
         }