Changeset 5a6cc679 in mainline for uspace/app/sbi/src/os

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

Location:

uspace/app/sbi/src/os

Files:

• helenos.c (modified) (3 diffs)
• os.h (modified) (1 diff)
• posix.c (modified) (4 diffs)

uspace/app/sbi/src/os/helenos.c

@@ -151 +151 @@
  *                      EIO on decoding error.
  */
-int os_str_get_char(const char *str, int index, int *out_char)
+errno_t os_str_get_char(const char *str, int index, int *out_char)
 {
         size_t offset;
@@ -210 +210 @@
  * @param ptr   Place to store pointer to new string.
  */
-int os_input_line(const char *prompt, char **ptr)
+errno_t os_input_line(const char *prompt, char **ptr)
 {
         char *line;
-        int rc;
+        errno_t rc;
 
         if (tinput == NULL) {
@@ -247 +247 @@
  *              Command is present just one, not duplicated.
  */
-int os_exec(char *const cmd[])
+errno_t os_exec(char *const cmd[])
 {
         task_id_t tid;
         task_wait_t twait;
         task_exit_t texit;
-        int rc;
+        errno_t rc;
         int retval;
 

uspace/app/sbi/src/os/os.h

@@ -35 +35 @@
 char *os_str_dup(const char *str);
 size_t os_str_length(const char *str);
-int os_str_get_char(const char *str, int index, int *out_char);
+errno_t os_str_get_char(const char *str, int index, int *out_char);
 char *os_chr_to_astr(wchar_t chr);
 void os_input_disp_help(void);
-int os_input_line(const char *prompt, char **ptr);
-int os_exec(char * const cmd[]);
+errno_t os_input_line(const char *prompt, char **ptr);
+errno_t os_exec(char * const cmd[]);
 
 void os_store_ef_path(char *path);

uspace/app/sbi/src/os/posix.c

@@ -114 +114 @@
  * @return      Zero if equal, nonzero if not equal
  */
-int os_str_cmp(const char *a, const char *b)
+errno_t os_str_cmp(const char *a, const char *b)
 {
         return strcmp(a, b);
@@ -147 +147 @@
  *                      EIO on decoding error.
  */
-int os_str_get_char(const char *str, int index, int *out_char)
+errno_t os_str_get_char(const char *str, int index, int *out_char)
 {
         size_t len;
@@ -193 +193 @@
  * @param ptr   Place to store pointer to new string.
  */
-int os_input_line(const char *prompt, char **ptr)
+errno_t os_input_line(const char *prompt, char **ptr)
 {
         printf("%s", prompt);
@@ -214 +214 @@
  *              Command is present just one, not duplicated.
  */
-int os_exec(char *const cmd[])
+errno_t os_exec(char *const cmd[])
 {
         pid_t pid;