Changeset 46577995 in mainline for uspace/app/edit

Timestamp:

2018-01-04T20:50:52Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

e211ea04

Parents:

facacc71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

After this commit, HelenOS is free of code that mixes error codes with non-error
values on the assumption that error codes are negative.

Location:

uspace/app/edit

Files:

• edit.c (modified) (12 diffs)
• search.c (modified) (1 diff)
• search.h (modified) (2 diffs)
• sheet.c (modified) (3 diffs)
• sheet.h (modified) (1 diff)

uspace/app/edit/edit.c

@@ -132 +132 @@
 static void pos_handle(pos_event_t *ev);
 
-static int file_save(char const *fname);
+static errno_t file_save(char const *fname);
 static void file_save_as(void);
-static int file_insert(char *fname);
-static int file_save_range(char const *fname, spt_t const *spos,
+static errno_t file_insert(char *fname);
+static errno_t file_save_range(char const *fname, spt_t const *spos,
     spt_t const *epos);
 static char *range_get_str(spt_t const *spos, spt_t const *epos);
@@ -191 +191 @@
         cons_event_t ev;
         bool new_file;
-        int rc;
+        errno_t rc;
 
         con = console_init(stdin, stdout);
@@ -578 +578 @@
 
 /** Save the document. */
-static int file_save(char const *fname)
+static errno_t file_save(char const *fname)
 {
         spt_t sp, ep;
-        int rc;
+        errno_t rc;
 
         status_display("Saving...");
@@ -589 +589 @@
         rc = file_save_range(fname, &sp, &ep);
 
-        switch (rc) {
-        case EINVAL:
+        switch ((case_errno_t) rc) {
+        case (case_errno_t) EINVAL:
                 status_display("Error opening file!");
                 break;
-        case EIO:
+        case (case_errno_t) EIO:
                 status_display("Error writing data!");
                 break;
@@ -616 +616 @@
         }
 
-        int rc = file_save(fname);
+        errno_t rc = file_save(fname);
         if (rc != EOK)
                 return;
@@ -697 +697 @@
  * of the caret.
  */
-static int file_insert(char *fname)
+static errno_t file_insert(char *fname)
 {
         FILE *f;
@@ -735 +735 @@
 
 /** Save a range of text into a file. */
-static int file_save_range(char const *fname, spt_t const *spos,
+static errno_t file_save_range(char const *fname, spt_t const *spos,
     spt_t const *epos)
 {
@@ -1283 +1283 @@
 
 /* Search operations */
-static int search_spt_producer(void *data, wchar_t *ret)
+static errno_t search_spt_producer(void *data, wchar_t *ret)
 {
         assert(data != NULL);
@@ -1292 +1292 @@
 }
 
-static int search_spt_reverse_producer(void *data, wchar_t *ret)
+static errno_t search_spt_reverse_producer(void *data, wchar_t *ret)
 {
         assert(data != NULL);
@@ -1301 +1301 @@
 }
 
-static int search_spt_mark(void *data, void **mark)
+static errno_t search_spt_mark(void *data, void **mark)
 {
         assert(data != NULL);
@@ -1397 +1397 @@
         
         match_t match;
-        int rc = search_next_match(search, &match);
+        errno_t rc = search_next_match(search, &match);
         if (rc != EOK) {
                 status_display("Failed searching.");
@@ -1515 +1515 @@
         size_t off;
         wchar_t c;
-        int rc;
+        errno_t rc;
 
         rc = clipboard_get_str(&str);

uspace/app/edit/search.c

@@ -105 +105 @@
 }
 
-int search_next_match(search_t *s, match_t *match)
+errno_t search_next_match(search_t *s, match_t *match)
 {
         search_equals_fn eq = s->ops.equals;
         
         wchar_t cur_char;
-        int rc = EOK;
+        errno_t rc = EOK;
         while ((rc = s->ops.producer(s->client_data, &cur_char)) == EOK && cur_char > 0) {
                 /* Deal with mismatches */

uspace/app/edit/search.h

@@ -43 +43 @@
 typedef struct search search_t;
 typedef bool (*search_equals_fn)(const wchar_t, const wchar_t);
-typedef int (*search_producer_fn)(void *, wchar_t *);
-typedef int (*search_mark_fn)(void *, void **);
+typedef errno_t (*search_producer_fn)(void *, wchar_t *);
+typedef errno_t (*search_mark_fn)(void *, void **);
 typedef void (*search_mark_free_fn)(void *);
 
@@ -61 +61 @@
 extern bool char_exact_equals(const wchar_t, const wchar_t);
 extern search_t *search_init(const char *, void *, search_ops_t, bool);
-extern int search_next_match(search_t *, match_t *);
+extern errno_t search_next_match(search_t *, match_t *);
 extern void search_fini(search_t *);
 

uspace/app/edit/sheet.c

@@ -67 +67 @@
 
 /** Initialize an empty sheet. */
-int sheet_create(sheet_t **rsh)
+errno_t sheet_create(sheet_t **rsh)
 {
         sheet_t *sh;
@@ -101 +101 @@
  *              and vice versa.
  */
-int sheet_insert(sheet_t *sh, spt_t *pos, enum dir_spec dir, char *str)
+errno_t sheet_insert(sheet_t *sh, spt_t *pos, enum dir_spec dir, char *str)
 {
         char *ipp;
@@ -147 +147 @@
  * @return      EOK on success or an error code.
  **/
-int sheet_delete(sheet_t *sh, spt_t *spos, spt_t *epos)
+errno_t sheet_delete(sheet_t *sh, spt_t *spos, spt_t *epos)
 {
         char *spp;

uspace/app/edit/sheet.h

@@ -90 +90 @@
 } tag_t;
 
-extern int sheet_create(sheet_t **);
-extern int sheet_insert(sheet_t *, spt_t *, enum dir_spec, char *);
-extern int sheet_delete(sheet_t *, spt_t *, spt_t *);
+extern errno_t sheet_create(sheet_t **);
+extern errno_t sheet_insert(sheet_t *, spt_t *, enum dir_spec, char *);
+extern errno_t sheet_delete(sheet_t *, spt_t *, spt_t *);
 extern void sheet_copy_out(sheet_t *, spt_t const *, spt_t const *, char *,
     size_t, spt_t *);