Changes in uspace/lib/gui/terminal.c [38d150e:1d6dd2a] in mainline

File:

• uspace/lib/gui/terminal.c (modified) (12 diffs)

uspace/lib/gui/terminal.c

@@ -47 +47 @@
 #include <atomic.h>
 #include <stdarg.h>
+#include <str.h>
 #include "window.h"
 #include "terminal.h"
@@ -62 +63 @@
 static LIST_INITIALIZE(terms);
 
-static int term_open(con_srvs_t *, con_srv_t *);
-static int term_close(con_srv_t *);
-static int term_read(con_srv_t *, void *, size_t);
-static int term_write(con_srv_t *, void *, size_t);
+static errno_t term_open(con_srvs_t *, con_srv_t *);
+static errno_t term_close(con_srv_t *);
+static errno_t term_read(con_srv_t *, void *, size_t, size_t *);
+static errno_t term_write(con_srv_t *, void *, size_t, size_t *);
 static void term_sync(con_srv_t *);
 static void term_clear(con_srv_t *);
 static void term_set_pos(con_srv_t *, sysarg_t col, sysarg_t row);
-static int term_get_pos(con_srv_t *, sysarg_t *, sysarg_t *);
-static int term_get_size(con_srv_t *, sysarg_t *, sysarg_t *);
-static int term_get_color_cap(con_srv_t *, console_caps_t *);
+static errno_t term_get_pos(con_srv_t *, sysarg_t *, sysarg_t *);
+static errno_t term_get_size(con_srv_t *, sysarg_t *, sysarg_t *);
+static errno_t term_get_color_cap(con_srv_t *, console_caps_t *);
 static void term_set_style(con_srv_t *, console_style_t);
 static void term_set_color(con_srv_t *, console_color_t, console_color_t,
@@ -77 +78 @@
 static void term_set_rgb_color(con_srv_t *, pixel_t, pixel_t);
 static void term_set_cursor_visibility(con_srv_t *, bool);
-static int term_get_event(con_srv_t *, cons_event_t *);
+static errno_t term_get_event(con_srv_t *, cons_event_t *);
 
 static con_ops_t con_ops = {
@@ -376 +377 @@
 }
 
-static int term_open(con_srvs_t *srvs, con_srv_t *srv)
+static errno_t term_open(con_srvs_t *srvs, con_srv_t *srv)
 {
         return EOK;
 }
 
-static int term_close(con_srv_t *srv)
+static errno_t term_close(con_srv_t *srv)
 {
         return EOK;
 }
 
-static int term_read(con_srv_t *srv, void *buf, size_t size)
+static errno_t term_read(con_srv_t *srv, void *buf, size_t size, size_t *nread)
 {
         terminal_t *term = srv_to_terminal(srv);
@@ -431 +432 @@
         }
         
-        return size;
+        *nread = size;
+        return EOK;
 }
 
@@ -462 +464 @@
 }
 
-static int term_write(con_srv_t *srv, void *data, size_t size)
+static errno_t term_write(con_srv_t *srv, void *data, size_t size, size_t *nwritten)
 {
         terminal_t *term = srv_to_terminal(srv);
@@ -470 +472 @@
                 term_write_char(term, str_decode(data, &off, size));
         
-        return size;
+        *nwritten = size;
+        return EOK;
 }
 
@@ -502 +505 @@
 }
 
-static int term_get_pos(con_srv_t *srv, sysarg_t *col, sysarg_t *row)
+static errno_t term_get_pos(con_srv_t *srv, sysarg_t *col, sysarg_t *row)
 {
         terminal_t *term = srv_to_terminal(srv);
@@ -513 +516 @@
 }
 
-static int term_get_size(con_srv_t *srv, sysarg_t *cols, sysarg_t *rows)
+static errno_t term_get_size(con_srv_t *srv, sysarg_t *cols, sysarg_t *rows)
 {
         terminal_t *term = srv_to_terminal(srv);
@@ -525 +528 @@
 }
 
-static int term_get_color_cap(con_srv_t *srv, console_caps_t *caps)
+static errno_t term_get_color_cap(con_srv_t *srv, console_caps_t *caps)
 {
         (void) srv;
@@ -573 +576 @@
 }
 
-static int term_get_event(con_srv_t *srv, cons_event_t *event)
+static errno_t term_get_event(con_srv_t *srv, cons_event_t *event)
 {
         terminal_t *term = srv_to_terminal(srv);
@@ -749 +752 @@
         term->srvs.sarg = term;
         
-        int rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME);
         if (rc != EOK) {
                 widget_deinit(&term->widget);