Commit 3f1bfec571c1c3e1a68914f7cace0043d1222a46
2024-03-01T17:58:46
remove <err.h>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125
diff --git a/libc3/c3.c b/libc3/c3.c
index d2c6890..a5636bb 100644
--- a/libc3/c3.c
+++ b/libc3/c3.c
@@ -10,9 +10,8 @@
* AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
* THIS SOFTWARE.
*/
-#include <assert.h>
+#include "assert.h"
#include <dlfcn.h>
-#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include "bool.h"
@@ -33,9 +32,9 @@ sw g_c3_exit_code = 1;
void c3_break (void)
{
+ err_puts("break");
assert(! "break");
- errx(1, "break");
- exit(1);
+ abort();
}
void c3_clean (s_env *env)
diff --git a/libc3/compare.c b/libc3/compare.c
index c6434dc..081a3a8 100644
--- a/libc3/compare.c
+++ b/libc3/compare.c
@@ -10,8 +10,7 @@
* AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
* THIS SOFTWARE.
*/
-#include <assert.h>
-#include <err.h>
+#include "assert.h"
#include <string.h>
#include "compare.h"
#include "data.h"
@@ -240,8 +239,8 @@ s8 compare_fn_clause (const s_fn_clause *a, const s_fn_clause *b)
a = a->next_clause;
b = b->next_clause;
}
- assert(! "compare_fn");
- err(1, "compare_fn");
+ err_puts("compare_fn_clause");
+ assert(! "compare_fn_clause");
return 0;
}
@@ -270,7 +269,9 @@ s8 compare_integer (const s_integer *a, const s_integer *b)
case MP_EQ: return 0;
case MP_GT: return 1;
}
- errx(1, "integer_compare: %s", mp_error_to_string(r));
+ err_write_1("integer_compare: ");
+ err_puts(mp_error_to_string(r));
+ assert(! "integer_compare");
return -1;
}
@@ -300,8 +301,11 @@ s8 compare_integer_u64 (const s_integer *a, u64 b)
case MP_EQ: return 0;
case MP_GT: return 1;
}
- errx(1, "integer_compare: %s", mp_error_to_string(r));
- return -1;
+ err_write_1("integer_compare: ");
+ err_puts(mp_error_to_string(r));
+ assert(! "integer_compare: mp_cmp_d");
+ abort();
+ return -2;
}
/* FIXME: dotted lists and circular lists */
@@ -953,8 +957,8 @@ s8 compare_tag (const s_tag *a, const s_tag *b) {
case TAG_UW:
break;
}
- warnx("compare_tag: unknown tag type: %d", a->type);
- assert(! "compare_tag: unknown tag type");
+ err_puts("compare_tag: invalid tag type");
+ assert(! "compare_tag: invalid tag type");
return 0;
}
@@ -1172,8 +1176,8 @@ s8 compare_tag_number (const s_tag *a, const s_tag *b)
break;
default: ;
}
+ err_puts("tag_number_compare: not a number");
assert(! "tag_number_compare: not a number");
- errx(1, "tag_number_compare: not a number");
return 0;
}
diff --git a/libc3/error_handler.c b/libc3/error_handler.c
index 26ac35e..df41245 100644
--- a/libc3/error_handler.c
+++ b/libc3/error_handler.c
@@ -10,9 +10,8 @@
* AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
* THIS SOFTWARE.
*/
-#include <assert.h>
-#include <err.h>
-#include <stdlib.h>
+#include "alloc.h"
+#include "assert.h"
#include "error_handler.h"
void error_handler_clean (s_error_handler *error_handler)
@@ -49,7 +48,8 @@ error_handler_init (s_error_handler *error_handler,
s_error_handler * error_handler_new (s_error_handler *next)
{
s_error_handler *error_handler;
- if (! (error_handler = malloc(sizeof(s_error_handler))))
- errx(1, "error_handler_new: out of memory");
+ error_handler = alloc(sizeof(s_error_handler));
+ if (! error_handler)
+ return NULL;
return error_handler_init(error_handler, next);
}