Changeset e273e9e in mainline for uspace/app/terminal/terminal.c

Timestamp:

2024-10-03T18:48:48Z (8 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

5132379

Parents:

b2c9e42c

Message:

Move link out of cons_event_t

File:

• uspace/app/terminal/terminal.c (modified) (4 diffs)

uspace/app/terminal/terminal.c

@@ -403 +403 @@
                 if (pos < size) {
                         link_t *link = prodcons_consume(&term->input_pc);
-                        cons_event_t *event = list_get_instance(link, cons_event_t, link);
+                        terminal_event_t *qevent = list_get_instance(link,
+                            terminal_event_t, link);
+                        cons_event_t *event = &qevent->ev;
 
                         /* Accept key presses of printable chars only. */
@@ -417 +419 @@
                         }
 
-                        free(event);
+                        free(qevent);
                 }
         }
@@ -635 +637 @@
         terminal_t *term = srv_to_terminal(srv);
         link_t *link = prodcons_consume(&term->input_pc);
-        cons_event_t *ev = list_get_instance(link, cons_event_t, link);
-
-        *event = *ev;
+        terminal_event_t *ev = list_get_instance(link, terminal_event_t, link);
+
+        *event = ev->ev;
         free(ev);
         return EOK;
@@ -823 +825 @@
 {
         /* Got key press/release event */
-        cons_event_t *event =
-            (cons_event_t *) malloc(sizeof(cons_event_t));
+        terminal_event_t *event =
+            (terminal_event_t *) malloc(sizeof(terminal_event_t));
         if (event == NULL)
                 return;
 
-        *event = *ev;
+        event->ev = *ev;
         link_initialize(&event->link);