From: hadaq <hadaq>
Date: Mon, 30 May 2011 10:37:10 +0000 (+0000)
Subject: Bug fixed in env2int(). Sergey.
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0ca2cf2aebaad0a0cd664ce6ebdddf7e80cdf7bd;p=daqdata.git

Bug fixed in env2int(). Sergey.
---

diff --git a/ebctrl/ioc/ebctrlApp/src/errbitstat.c b/ebctrl/ioc/ebctrlApp/src/errbitstat.c
index d17d3fd..5b11f74 100644
--- a/ebctrl/ioc/ebctrlApp/src/errbitstat.c
+++ b/ebctrl/ioc/ebctrlApp/src/errbitstat.c
@@ -38,7 +38,8 @@ TheErrMsg errMsgs[] = {
   {23, "Single broken event"},
   {24, "Ethernet link broken"},
   {26, "Ethernet error"},
-  {27, "Timing trigger error"} };
+  {27, "Timing trigger error"} 
+};
 
 static int env2int(char *envName)
 {
@@ -48,32 +49,28 @@ static int env2int(char *envName)
   int retVal = 0;
   char *envVar;
 
-  if(! strcmp(envName, "ERRBITLOG")){
-    envVar = getenv(envName);
+  envVar = getenv(envName);
 
-    if(envVar == NULL){
+  if(envVar != NULL){
+    retVal = atoi(envVar);
+  }
+  else{
+    if(! strcmp(envName, "ERRBITLOG")){
       retVal = ERRBITLOG;
-
-      if(errbitstatDebug)
-	printf("<E> errbitstat.c: env var %s is not set! Default to %i\n", envName, retVal);      
     }
-  }
-  else if(! strcmp(envName, "ERRBITWAIT")){
-    envVar = getenv(envName);
-
-    if(envVar == NULL){
+    else if(! strcmp(envName, "ERRBITWAIT")){
       retVal = ERRBITWAIT;
-      
+    }
+    else{
       if(errbitstatDebug)
-	printf("<E> errbitstat.c: env var %s is not set! Default to %i\n", envName, retVal);
+	printf("<E> errbitstat.c: env var %s is not known!");
     }
-  }
-  else{
+
     if(errbitstatDebug)
-      printf("<E> errbitstat.c: env var %s is not known! Default to %i\n", envName, retVal);
+      printf("<E> errbitstat.c: env var %s is not set! Default to %i\n", envName, retVal);
   }
-
-  return retVal; 
+      
+  return retVal;
 }
 
 static void errbit2logger( const uint32_t errbit, const uint32_t errbitstat, int nrOfErrWord, const int subsys )
@@ -97,7 +94,6 @@ static void errbit2logger( const uint32_t errbit, const uint32_t errbitstat, int
    *  If errBitStatistics increased...
    */
   if(errbitstat != statOld[nrOfErrWord][subsys]){
-
     for( i=0; i<MAXERRS; i++ ){
       if( errbit & (0x00000001 << errMsgs[i].bit) ){
 	sprintf(msg, "EB%s <E> subsys: %i errbit: %d msg: %s", getenv("EBNUM"), subsys, errMsgs[i].bit, errMsgs[i].msg);