Changeset f538ef3 in mainline

Timestamp:

2017-09-23T11:41:08Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

75c3830

Parents:

bd1745f

Message:

No need to have a (broken) BSD errx() function in libc.

Location:

uspace

Files:

• app/tetris/scores.c (modified) (1 diff)
• app/tetris/screen.c (modified) (2 diffs)
• app/tetris/tetris.c (modified) (2 diffs)
• lib/c/generic/getopt.c (modified) (1 diff)
• lib/c/include/err.h (deleted)

uspace/app/tetris/scores.c

@@ -65 +65 @@
 #include <vfs/vfs.h>
 #include <stdlib.h>
-#include <err.h>
 #include <time.h>
 #include "screen.h"

uspace/app/tetris/screen.c

@@ -54 +54 @@
  */
 
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -198 +197 @@
                 scr_end();
         
-        errx(1, "aborting: %s", why);
+        fprintf(stderr, "aborting: %s", why);
+        abort();
 }
 

uspace/app/tetris/tetris.c

@@ -56 +56 @@
 
 #include <sys/time.h>
-#include <err.h>
 #include <errno.h>
 #include <stdio.h>
@@ -289 +288 @@
         for (i = 0; i <= 5; i++) {
                 for (j = i + 1; j <= 5; j++) {
-                        if (keys[i] == keys[j])
-                                errx(1, "%s", "duplicate command keys specified.");
+                        if (keys[i] == keys[j]) {
+                                fprintf(stderr, "duplicate command keys specified.");
+                                abort();
+                        }
                 }
                 

uspace/lib/c/generic/getopt.c

@@ -34 +34 @@
 #include <assert.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <err.h>
 #include <errno.h>
 #include <getopt.h>