From: hadaq <hadaq>
Date: Tue, 27 Jul 2010 19:32:34 +0000 (+0000)
Subject: new error function definitions
X-Git-Tag: v6.0~220
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=8c9383c1a504cf5fee8f5a20b1a9b60cf80609ea;p=trbnettools.git

new error function definitions
---

diff --git a/libtrbnet/trberror.c b/libtrbnet/trberror.c
index 7477412..5d8d69e 100644
--- a/libtrbnet/trberror.c
+++ b/libtrbnet/trberror.c
@@ -13,18 +13,32 @@ TRB_TERM trb_term = {0, 0, 0, 0};
 void trb_error(const char *s)
 {
   if (s != NULL) {
-    fprintf(stderr, "%s: %s\n", s, trb_strerror(trb_errno));
+    fprintf(stderr, "%s: %s\n", s, trb_errorstr(trb_errno));
   } else {
-    fprintf(stderr, "%s\n", trb_strerror(trb_errno));
+    fprintf(stderr, "%s\n", trb_errorstr(trb_errno));
   }
   
   /* Print Statusbits */
-  if (trb_errno == TRB_STATUS_ERROR) {
-    fprintf(stderr, "%s\n", trb_strterm(trb_term));
+  if ((trb_errno == TRB_STATUS_ERROR) || (trb_errno == TRB_STATUS_WARNING)) {
+    fprintf(stderr, "%s\n", trb_termstr(trb_term));
+  }
+}
+
+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));
+  } else {
+    snprintf(buffer, 4096, ">%s", trb_strerror(trb_errno));
   }
+  
+  return buffer;
 }
 
-const char* trb_strerror(int trberrno)
+const char* trb_errorstr(int trberrno)
 {
   static const char errorstring[][80] = {
     "No Error",
@@ -63,7 +77,7 @@ const char* trb_strerror(int trberrno)
   }
 }
 
-const char* trb_strterm(TRB_TERM term)
+const char* trb_termstr(TRB_TERM term)
 {
   static const char commonStatusBits[16][64] = { 
     "COM_EndpointReached: no endpoint has been reached",         /* status */
@@ -154,16 +168,3 @@ const char* trb_strterm(TRB_TERM term)
   return buffer;
 }
 
-const char* trb_strerrorf()
-{
-  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_strterm(trb_term));
-  } else {
-    snprintf(buffer, 4096, ">%s", trb_strerror(trb_errno));
-  }
-  
-  return buffer;
-}
diff --git a/libtrbnet/trberror.h b/libtrbnet/trberror.h
index 695b798..094a8bb 100644
--- a/libtrbnet/trberror.h
+++ b/libtrbnet/trberror.h
@@ -37,15 +37,7 @@ typedef enum {
   TRB_STATUS_WARNING = 26
 } TRB_ERROR;
 
-extern int trb_errno;
-
-void trb_error(const char *s);
-
-const char* trb_strerror(int trberrno);
-
-
 /* last TRBNet-TermPackage */
-
 typedef struct {
   uint16_t status_common;
   uint16_t status_channel;
@@ -53,11 +45,18 @@ typedef struct {
   uint8_t channel;
 } TRB_TERM;
 
+extern int trb_errno;
+
 extern TRB_TERM trb_term;
 
-const char* trb_strterm(TRB_TERM term);
+void trb_error(const char *s);
+
+const char* trb_strerror();
+
+
+const char* trb_errorstr(int trberrno);
 
-const char* trb_strerrorf();
+const char* trb_termstr(TRB_TERM term);
 
 #ifdef __cplusplus
 }