Changeset b7fd2a0 in mainline for uspace/dist

Timestamp:

2018-01-13T03:10:29Z (8 years ago)

Author:

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

Branches:

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

Children:

a53ed3a

Parents:

36f0738

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.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:

uspace/dist/src/c/demos

Files:

• edit/edit.c (modified) (5 diffs)
• edit/search.c (modified) (1 diff)
• edit/search.h (modified) (2 diffs)
• edit/sheet.c (modified) (3 diffs)
• edit/sheet.h (modified) (1 diff)
• hello/hello.c (modified) (1 diff)
• tetris/scores.c (modified) (2 diffs)
• tetris/scores.h (modified) (1 diff)
• tetris/screen.c (modified) (3 diffs)
• tetris/screen.h (modified) (2 diffs)
• tetris/shapes.c (modified) (1 diff)
• tetris/tetris.h (modified) (1 diff)
• top/screen.c (modified) (1 diff)
• top/screen.h (modified) (1 diff)

uspace/dist/src/c/demos/edit/edit.c

@@ -190 +190 @@
         cons_event_t ev;
         bool new_file;
-        int rc;
+        errno_t rc;
 
         con = console_init(stdin, stdout);
@@ -580 +580 @@
 {
         spt_t sp, ep;
-        int rc;
+        errno_t rc;
 
         status_display("Saving...");
@@ -615 +615 @@
         }
 
-        int rc = file_save(fname);
+        errno_t rc = file_save(fname);
         if (rc != EOK)
                 return;
@@ -1330 +1330 @@
         
         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.");
@@ -1448 +1448 @@
         size_t off;
         wchar_t c;
-        int rc;
+        errno_t rc;
 
         rc = clipboard_get_str(&str);

uspace/dist/src/c/demos/edit/search.c

@@ -104 +104 @@
 }
 
-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/dist/src/c/demos/edit/search.h

@@ -42 +42 @@
 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 *);
 
@@ -60 +60 @@
 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/dist/src/c/demos/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/dist/src/c/demos/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 *);

uspace/dist/src/c/demos/hello/hello.c

@@ -1 @@
-extern int putchar(char);
+extern errno_t putchar(char);
 
 #define TERMINATOR '!'

uspace/dist/src/c/demos/tetris/scores.c

@@ -206 +206 @@
 }
 
-int loadscores(void)
+errno_t loadscores(void)
 {
         FILE *f;
         size_t cnt;
-        int rc;
+        errno_t rc;
 
         f = fopen("/data/tetris.sco", "rb");
@@ -229 +229 @@
         FILE *f;
         size_t cnt;
-        int rc;
+        errno_t rc;
 
         f = fopen("/data/tetris.sco", "wb");

uspace/dist/src/c/demos/tetris/scores.h

@@ -72 +72 @@
 extern void initscores(void);
 extern void insertscore(int score, int level);
-extern int loadscores(void);
+extern errno_t loadscores(void);
 extern void savescores(void);
 

uspace/dist/src/c/demos/tetris/screen.c

@@ -147 +147 @@
 {
         sysarg_t ccap;
-        int rc = console_get_color_cap(console, &ccap);
+        errno_t rc = console_get_color_cap(console, &ccap);
         
         if (rc != 0)
@@ -353 +353 @@
  *
  */
-int tgetchar(void)
+errno_t tgetchar(void)
 {
         /*
@@ -392 +392 @@
  *
  */
-int twait(void)
+errno_t twait(void)
 {
         wchar_t c = 0;

uspace/dist/src/c/demos/tetris/screen.h

@@ -71 +71 @@
 extern void clear_screen(void);
 
-extern int put(int);
+extern errno_t put(int);
 extern void scr_clear(void);
 extern void scr_end(void);
@@ -80 +80 @@
 
 extern void tsleep(void);
-extern int tgetchar(void);
-extern int twait(void);
+extern errno_t tgetchar(void);
+extern errno_t twait(void);
 
 /** @}

uspace/dist/src/c/demos/tetris/shapes.c

@@ -93 +93 @@
  * taking the current board into account.
  */
-int fits_in(const struct shape *shape, int pos)
+errno_t fits_in(const struct shape *shape, int pos)
 {
         const int *o = shape->off;

uspace/dist/src/c/demos/tetris/tetris.h

@@ -194 +194 @@
 extern int classic;
 
-extern int fits_in(const struct shape *, int);
+extern errno_t fits_in(const struct shape *, int);
 extern void place(const struct shape *, int, int);
 extern void stop(const char *);

uspace/dist/src/c/demos/top/screen.c

@@ -537 +537 @@
  *
  */
-int tgetchar(unsigned int sec)
+errno_t tgetchar(unsigned int sec)
 {
         /*

uspace/dist/src/c/demos/top/screen.h

@@ -47 +47 @@
     PRINTF_ATTRIBUTE(1, 2);
 
-extern int tgetchar(unsigned int);
+extern errno_t tgetchar(unsigned int);
 
 #endif