From e5593c095b85d4e9f6afcb223187831bfa9f21e3 Mon Sep 17 00:00:00 2001 From: hadaq Date: Tue, 27 Jul 2010 20:36:04 +0000 Subject: [PATCH] minor update --- libtrbnet/trberror.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/libtrbnet/trberror.c b/libtrbnet/trberror.c index 5d8d69e..984109c 100644 --- a/libtrbnet/trberror.c +++ b/libtrbnet/trberror.c @@ -12,15 +12,20 @@ TRB_TERM trb_term = {0, 0, 0, 0}; void trb_error(const char *s) { - if (s != NULL) { - fprintf(stderr, "%s: %s\n", s, trb_errorstr(trb_errno)); + if ((s != NULL) && (*s != '\0')) { + if ((trb_errno == TRB_STATUS_ERROR) || (trb_errno == TRB_STATUS_WARNING)) { + fprintf(stderr, "%s: %s\n%s\n", + s, trb_errorstr(trb_errno), trb_termstr(trb_term)); + } else { + fprintf(stderr, "%s: %s\n", s, trb_errorstr(trb_errno)); + } } else { - fprintf(stderr, "%s\n", trb_errorstr(trb_errno)); - } - - /* Print Statusbits */ - if ((trb_errno == TRB_STATUS_ERROR) || (trb_errno == TRB_STATUS_WARNING)) { - fprintf(stderr, "%s\n", trb_termstr(trb_term)); + if ((trb_errno == TRB_STATUS_ERROR) || (trb_errno == TRB_STATUS_WARNING)) { + fprintf(stderr, "%s\n%s\n", + trb_errorstr(trb_errno), trb_termstr(trb_term)); + } else { + fprintf(stderr, "%s\n", trb_errorstr(trb_errno)); + } } } @@ -29,10 +34,10 @@ const char* trb_strerror() static char buffer[4096] = ""; if ((trb_errno == TRB_STATUS_ERROR) || (trb_errno == TRB_STATUS_WARNING)) { - snprintf(buffer, 4096, ">%s\n%s", - trb_strerror(trb_errno), trb_termstr(trb_term)); + snprintf(buffer, 4096, "%s\n%s", + trb_errorstr(trb_errno), trb_termstr(trb_term)); } else { - snprintf(buffer, 4096, ">%s", trb_strerror(trb_errno)); + snprintf(buffer, 4096, "%s", trb_errorstr(trb_errno)); } return buffer; @@ -73,7 +78,7 @@ const char* trb_errorstr(int trberrno) if (trberrno < 27) { return errorstring[trberrno]; } else { - return ">Unknown Errno"; + return "Unknown Errno"; } } @@ -142,25 +147,25 @@ const char* trb_termstr(TRB_TERM term) unsigned int i; if (term.channel >= 4) { - sprintf(buffer, ">INVALID ChannelId %d", term.channel); + sprintf(buffer, "INVALID ChannelId %d", term.channel); return buffer; } sprintf(buffer, - ">CommonStatusBits: 0x%04x, Channel#%d StatusBits: 0x%04x", + "CommonStatusBits: 0x%04x, Channel#%d StatusBits: 0x%04x", term.status_common, term.channel, term.status_channel); for (i = 0; i < 16; i++) { if ((term.status_common & (0x01 << i)) != (i != 0 ? 0 : 1)) { - strcat(buffer, "\n> "); + strcat(buffer, "\n "); strcat(buffer, commonStatusBits[i]); } } for (i = 0; i < 16; i++) { if ((term.status_channel & (0x01 << i)) != 0) { - strcat(buffer, "\n> "); + strcat(buffer, "\n "); strcat(buffer, chStatusBits[term.channel] + 64 * i); } } -- 2.43.0