Changeset b7fd2a0 in mainline for uspace/dist/src/c/demos/tetris

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/tetris

Files:

• scores.c (modified) (2 diffs)
• scores.h (modified) (1 diff)
• screen.c (modified) (3 diffs)
• screen.h (modified) (2 diffs)
• shapes.c (modified) (1 diff)
• tetris.h (modified) (1 diff)

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 *);