Changeset 5a6cc679 in mainline for uspace/lib/clui

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/lib/clui

Files:

• nchoice.c (modified) (4 diffs)
• nchoice.h (modified) (1 diff)
• tinput.c (modified) (6 diffs)
• tinput.h (modified) (3 diffs)

uspace/lib/clui/nchoice.c

@@ -43 +43 @@
  *
  */
-int nchoice_create(nchoice_t **rchoice)
+errno_t nchoice_create(nchoice_t **rchoice)
 {
         nchoice_t *choice = NULL;
-        int rc;
+        errno_t rc;
 
         choice = calloc(1, sizeof(nchoice_t));
@@ -82 +82 @@
 
 /** Set numerica choice prompt text */
-int nchoice_set_prompt(nchoice_t *choice, const char *prompt)
+errno_t nchoice_set_prompt(nchoice_t *choice, const char *prompt)
 {
         char *pstr;
@@ -96 +96 @@
 
 /** Add option to numerical choice */
-int nchoice_add(nchoice_t *choice, const char *opttext, void *arg,
+errno_t nchoice_add(nchoice_t *choice, const char *opttext, void *arg,
     nchoice_flag_t flags)
 {
@@ -127 +127 @@
 
 /** Get numerical choice from user */
-int nchoice_get(nchoice_t *choice, void **rarg)
+errno_t nchoice_get(nchoice_t *choice, void **rarg)
 {
         int i;
-        int rc;
+        errno_t rc;
         int ret;
         char *str;

uspace/lib/clui/nchoice.h

@@ -65 +65 @@
 } nchoice_t;
 
-extern int nchoice_create(nchoice_t **);
+extern errno_t nchoice_create(nchoice_t **);
 extern void nchoice_destroy(nchoice_t *);
-extern int nchoice_set_prompt(nchoice_t *, const char *);
-extern int nchoice_add(nchoice_t *, const char *, void *, nchoice_flag_t);
-extern int nchoice_get(nchoice_t *, void **);
+extern errno_t nchoice_set_prompt(nchoice_t *, const char *);
+extern errno_t nchoice_add(nchoice_t *, const char *, void *, nchoice_flag_t);
+extern errno_t nchoice_get(nchoice_t *, void **);
 
 #endif

uspace/lib/clui/tinput.c

@@ -185 +185 @@
 }
 
-static int tinput_display(tinput_t *ti)
+static errno_t tinput_display(tinput_t *ti)
 {
         sysarg_t col0, row0;
@@ -542 +542 @@
 {
         char *str;
-        int rc = clipboard_get_str(&str);
+        errno_t rc = clipboard_get_str(&str);
         
         if ((rc != EOK) || (str == NULL)) {
@@ -667 +667 @@
         size_t cnum;
         size_t i;
-        int rc;
+        errno_t rc;
 
         if (ti->compl_ops == NULL)
@@ -782 +782 @@
  * @return              EOK on success, ENOMEM if out of memory.
  */
-int tinput_set_prompt(tinput_t *ti, const char *prompt)
+errno_t tinput_set_prompt(tinput_t *ti, const char *prompt)
 {
         if (ti->prompt != NULL)
@@ -863 +863 @@
  *
  */
-int tinput_read_i(tinput_t *ti, const char *istr, char **dstr)
+errno_t tinput_read_i(tinput_t *ti, const char *istr, char **dstr)
 {
         console_flush(ti->console);
@@ -925 +925 @@
  *
  */
-int tinput_read(tinput_t *ti, char **dstr)
+errno_t tinput_read(tinput_t *ti, char **dstr)
 {
         return tinput_read_i(ti, "", dstr);

uspace/lib/clui/tinput.h

@@ -63 +63 @@
  * @return              EOK on success, error code on failure.
  */
-typedef int (*tinput_compl_init_fn)(wchar_t *text, size_t pos, size_t *cstart,
+typedef errno_t (*tinput_compl_init_fn)(wchar_t *text, size_t pos, size_t *cstart,
     void **state);
 
@@ -78 +78 @@
  * @return              EOK on success, error code on failure.
  */
-typedef int (*tinput_compl_get_next_fn)(void *state, char **compl);
+typedef errno_t (*tinput_compl_get_next_fn)(void *state, char **compl);
 
 
@@ -155 +155 @@
 
 extern tinput_t *tinput_new(void);
-extern int tinput_set_prompt(tinput_t *, const char *);
+extern errno_t tinput_set_prompt(tinput_t *, const char *);
 extern void tinput_set_compl_ops(tinput_t *, tinput_compl_ops_t *);
 extern void tinput_destroy(tinput_t *);
-extern int tinput_read(tinput_t *, char **);
-extern int tinput_read_i(tinput_t *, const char *, char **);
+extern errno_t tinput_read(tinput_t *, char **);
+extern errno_t tinput_read_i(tinput_t *, const char *, char **);
 
 #endif