BUGFIX -- mm

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index cd4dcd7a96e39d2f07ba230619b94eec5fd66980..3aabc428cd6a4aadc761411c3ebc1ba72f75b5a5 100644 (file)
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.64 2003-05-14 13:54:42 muench Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.65 2003-09-22 11:58:39 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -54,9 +54,7 @@ typedef struct TheArgsS {
        unsigned long queueSize;
        char verbosity[PARAM_MAX_VALUE_LEN];
        unsigned long evtId;
-}
-
-TheArgs;
+} TheArgs;
 
 typedef struct TheStatsS {
        unsigned long *evtsDiscarded;
@@ -66,9 +64,7 @@ typedef struct TheStatsS {
        unsigned long *bytesWritten;
        unsigned long *evtId[NEVTIDS];
        unsigned long *trigNr[32];
-}
-
-TheStats;
+} TheStats;
 
 static jmp_buf terminateJmp;
 
@@ -177,8 +173,7 @@ static int argsFromCL(TheArgs *my, int argc, char *argv[])
                        strcpy(my->slowCtrlFiles[my->slowCtrlFileCnt++], optarg);
                        break;
                case 's':
-                       syslog(LOG_WARNING,
-                                  "-s option obsolete, will be removed in a future version");
+                       syslog(LOG_WARNING, "-s option obsolete, will be removed in a future version");
                        break;
                case 'o':
                        strcpy(my->outPath, optarg);
@@ -220,8 +215,7 @@ static int argsFromParam(TheArgs *my, int argc, char *argv[])
        conSetupParam(param, getenv("DAQ_SETUP"));
 
        Param_getInt(param, argv[0], "nrofmsgs", &paramWasFound, &my->nrOfMsgs);
-       Param_getStringArray(param, argv[0], "slwctrlfile",
-                                                PARAM_MAX_ARRAY_LEN, &my->slowCtrlFileCnt, my->slowCtrlFiles);
+       Param_getStringArray(param, argv[0], "slwctrlfile", PARAM_MAX_ARRAY_LEN, &my->slowCtrlFileCnt, my->slowCtrlFiles);
        Param_getString(param, argv[0], "outpath", &paramWasFound, my->outPath);
        Param_getString(param, argv[0], "outdev", &paramWasFound, my->outDev);
        Param_getString(param, argv[0], "expid", &paramWasFound, my->expId);
@@ -476,8 +470,7 @@ int main(int argc, char *argv[])
                usage(argv[0]);
                exit(EXIT_FAILURE);
        }
-       for (i = 0; prioritynames[i].c_name != NULL
-                && 0 != strcmp(prioritynames[i].c_name, theArgs->verbosity); i++) {
+       for (i = 0; prioritynames[i].c_name != NULL && 0 != strcmp(prioritynames[i].c_name, theArgs->verbosity); i++) {
        }
        if (prioritynames[i].c_name == NULL) {
                exit(EXIT_FAILURE);
@@ -587,9 +580,7 @@ int main(int argc, char *argv[])
                                conHadTuQueue_voidP(hadTuQueue[i], storage);
                        }
                        subEvt = HadTuQueue_front(hadTuQueue[i]);
-                       syslog(LOG_DEBUG,
-                                  "hadTuQueue[%d]: %p = subEvt: %s",
-                                  i, subEvt, SubEvt_2charP(subEvt));
+                       syslog(LOG_DEBUG, "hadTuQueue[%d]: %p = subEvt: %s", i, subEvt, SubEvt_2charP(subEvt));
 
                        (*theStats->trigNr[i]) = SubEvt_trigNr(subEvt);
 
@@ -601,8 +592,7 @@ int main(int argc, char *argv[])
                                } else {
                                        currId = SubEvt_pureId(subEvt);
                                }
-                               syslog(LOG_DEBUG,
-                                          "currTrigNr: 0x%06x, currTrigTag 0x%02x, currId 0x%08x", currTrigNr, currTrigTag, currId);
+                               syslog(LOG_DEBUG, "currTrigNr: 0x%06x, currTrigTag 0x%02x, currId 0x%08x", currTrigNr, currTrigTag, currId);
                        }
                        trigNr = SubEvt_trigNr(subEvt) >> 8;
                        trigTag = SubEvt_trigNr(subEvt) & 0xff;
@@ -612,7 +602,7 @@ int main(int argc, char *argv[])
                                        if (SubEvt_dataError(subEvt)) {
                                                dataError = 1;
                                        }
-                                       if (trigNr != currTrigNr) {
+                                       if (trigTag != currTrigTag) {
                                                tagError = 1;
                                        }
                                        evt = Evt_appendSubEvt(evt, subEvt);