diff options
| author | midipix <writeonce@midipix.org> | 2016-10-26 01:28:54 -0400 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2016-10-26 01:28:54 -0400 |
| commit | cacd3e5f0c08e96e3bd7fbaebb3bbec3ec3751c1 (patch) | |
| tree | a3706492a2f77ee7ed1fc9524829481ffb575ea5 /src/output | |
| parent | 8ad14bb42706ebf7fe510df76c38e0a3bfa11601 (diff) | |
| download | slibtool-cacd3e5f0c08e96e3bd7fbaebb3bbec3ec3751c1.tar.bz2 slibtool-cacd3e5f0c08e96e3bd7fbaebb3bbec3ec3751c1.tar.xz | |
driver: struct slbt_error_info: extend and refactor.
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/slbt_output_error.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/output/slbt_output_error.c b/src/output/slbt_output_error.c index cfea7dc..0b8e21d 100644 --- a/src/output/slbt_output_error.c +++ b/src/output/slbt_output_error.c @@ -19,13 +19,13 @@ static const char aclr_magenta[] = "\x1b[35m"; static const char * slbt_output_error_header(const struct slbt_error_info * erri) { - if (erri->flags & SLBT_ERROR_CHILD) + if (erri->eflags & SLBT_ERROR_CHILD) return "exec error upon"; - else if (erri->flags & SLBT_ERROR_TOP_LEVEL) + else if (erri->eflags & SLBT_ERROR_TOP_LEVEL) return "error logged in"; - else if (erri->flags & SLBT_ERROR_NESTED) + else if (erri->eflags & SLBT_ERROR_NESTED) return "< returned to >"; else @@ -34,20 +34,20 @@ static const char * slbt_output_error_header(const struct slbt_error_info * erri static const char * slbt_output_strerror(const struct slbt_error_info * erri) { - if (erri->flags & SLBT_ERROR_CUSTOM) + if (erri->eflags & SLBT_ERROR_CUSTOM) return "flow error: unexpected condition or other"; - else if (erri->flags & SLBT_ERROR_NESTED) + else if (erri->eflags & SLBT_ERROR_NESTED) return ""; - else if (erri->flags & SLBT_ERROR_CHILD) + else if (erri->eflags & SLBT_ERROR_CHILD) return "(see child process error messages)"; - else if (erri->syserror == ENOBUFS) + else if (erri->esyscode == ENOBUFS) return "input error: string length exceeds buffer size."; else - return strerror(erri->syserror); + return strerror(erri->esyscode); } static int slbt_output_error_record_plain( @@ -59,8 +59,8 @@ static int slbt_output_error_record_plain( if (fprintf(stderr,"%s: %s %s(), line %d%s%s.\n", dctx->program, slbt_output_error_header(erri), - erri->function, - erri->line, + erri->efunction, + erri->eline, strlen(errdesc) ? ": " : "", errdesc) < 0) return -1; @@ -87,11 +87,11 @@ static int slbt_output_error_record_annotated( aclr_reset, aclr_bold,aclr_blue, - erri->function, + erri->efunction, aclr_reset, aclr_bold,aclr_green, - erri->line, + erri->eline, aclr_reset, strlen(errdesc) ? ": " : "", |