Changeset 5a6cc679 in mainline for uspace/app/tetris

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

Files:

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

uspace/app/tetris/scores.c

@@ -205 +205 @@
 }
 
-int loadscores(void)
+errno_t loadscores(void)
 {
         FILE *f;

uspace/app/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/app/tetris/screen.c

@@ -138 +138 @@
 winsize_t winsize;
 
-static int get_display_size(winsize_t *ws)
+static errno_t get_display_size(winsize_t *ws)
 {
         return console_get_size(console, &ws->ws_col, &ws->ws_row);
@@ -146 +146 @@
 {
         sysarg_t ccap;
-        int rc = console_get_color_cap(console, &ccap);
-        
-        if (rc != 0)
+        errno_t rc = console_get_color_cap(console, &ccap);
+        
+        if (rc != EOK)
                 return false;