X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/ad3c9f2af814c84582fdd1649e49ec4f68572c5a..15de9d6b4ab2de27ae24b13b7b6c4d55fffe4aef:/gen/FreeBSD/err.c diff --git a/gen/FreeBSD/err.c b/gen/FreeBSD/err.c index e6e03f6..39fac8a 100644 --- a/gen/FreeBSD/err.c +++ b/gen/FreeBSD/err.c @@ -82,7 +82,7 @@ __private_extern__ struct _e_err_exit _e_err_exit = {ERR_EXIT_UNDEF}; * otherwise use \x (x is value) * (NUL isn't used) */ -static unsigned char escape[256] = { +static const unsigned char escape[256] = { /* NUL */ 0, /* Unused: strings can't contain nulls */ /* SOH STX ETX EOT ENQ ACK BEL */ @@ -213,13 +213,17 @@ verrc(int eval, int code, const char *fmt, va_list ap) fprintf(_e_err_file, ": "); } fprintf(_e_err_file, "%s\n", strerror(code)); - if (_e_err_exit.type) + if (_e_err_exit.type) { #ifdef __BLOCKS__ - if (_e_err_exit.type == ERR_EXIT_BLOCK) + if (_e_err_exit.type == ERR_EXIT_BLOCK) { _e_err_exit.block(eval); - else -#endif /* __BLOCKS__ */ + } else { _e_err_exit.func(eval); + } +#else + _e_err_exit.func(eval); +#endif /* __BLOCKS__ */ + } exit(eval); } @@ -241,13 +245,17 @@ verrx(int eval, const char *fmt, va_list ap) if (fmt != NULL) _e_visprintf(_e_err_file, fmt, ap); fprintf(_e_err_file, "\n"); - if (_e_err_exit.type) + if (_e_err_exit.type) { #ifdef __BLOCKS__ - if (_e_err_exit.type == ERR_EXIT_BLOCK) + if (_e_err_exit.type == ERR_EXIT_BLOCK) { _e_err_exit.block(eval); - else -#endif /* __BLOCKS__ */ + } else { _e_err_exit.func(eval); + } +#else + _e_err_exit.func(eval); +#endif /* __BLOCKS__ */ + } exit(eval); }