From 244f31ab398be907f97676b82e125cf6a3732608 Mon Sep 17 00:00:00 2001 From: hades Date: Sun, 21 May 2000 21:45:02 +0000 Subject: [PATCH] Now the new taping seems to work well. --- hadaq/evt.c | 3 +-- hadaq/evt.h | 3 ++- hadaq/evtbuild.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hadaq/evt.c b/hadaq/evt.c index 0ab739c..084d30c 100644 --- a/hadaq/evt.c +++ b/hadaq/evt.c @@ -1,4 +1,4 @@ -static char rcsId[] = "$Id: evt.c,v 6.5 2000-05-21 18:35:47 hades Exp $"; +static char rcsId[] = "$Id: evt.c,v 6.6 2000-05-21 21:45:02 hades Exp $"; #define _ANSI_C_SOURCE #include @@ -11,7 +11,6 @@ static char rcsId[] = "$Id: evt.c,v 6.5 2000-05-21 18:35:47 hades Exp $"; #include "evt.h" #include "subevt.h" -#include "ansiTape.h" enum EvtIdx { EvtIdx_size, diff --git a/hadaq/evt.h b/hadaq/evt.h index 42b218f..4b59fef 100644 --- a/hadaq/evt.h +++ b/hadaq/evt.h @@ -7,6 +7,7 @@ #include "hadtu.h" #include "subevt.h" +#include "ansiTape.h" #define EVT_MAXSIZE (100 * 1024) @@ -59,7 +60,7 @@ void Evt_setRunNr(void *my, UInt4 runNr); void *newEvt(UInt4 decoding, UInt4 id, UInt4 runNr); void deleteEvt(void *my); int Evt_write(void *my, FILE * file); -int Evt_writeTape(void *my, void *tape); +int Evt_writeTape(void *my, AnsiTape *tape); void *Evt_fget(FILE * file); void *Evt_appendSubEvt(void *my, void *subEvt); diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c index 7544c99..1dbfa64 100644 --- 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.14 2000-05-21 18:35:47 hades Exp $"; +static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.15 2000-05-21 21:45:02 hades Exp $"; #define _XOPEN_SOURCE #include @@ -287,9 +287,9 @@ int main(int argc, char *argv[]) evt = appendFile(evt, slowCtrlFiles[i]); } if (outFile != NULL) { - if (strcmp(outDev, "file")) { + if (strcmp(outDev, "file") == 0) { Evt_write(evt, outFile); - } else if (strcmp(outDev, "tape")) { + } else if (strcmp(outDev, "tape") == 0) { Evt_writeTape(evt, outTape); } } @@ -353,9 +353,9 @@ int main(int argc, char *argv[]) } if (currNrOfSubEvts == nrOfSubEvts) { if (outFile != NULL) { - if (strcmp(outDev, "file")) { + if (strcmp(outDev, "file") == 0) { Evt_write(evt, outFile); - } else if (strcmp(outDev, "tape")) { + } else if (strcmp(outDev, "tape") == 0) { Evt_writeTape(evt, outTape); } } @@ -374,9 +374,9 @@ int main(int argc, char *argv[]) evt = appendFile(evt, slowCtrlFiles[i]); } if (outFile != NULL) { - if (strcmp(outDev, "file")) { + if (strcmp(outDev, "file") == 0) { Evt_write(evt, outFile); - } else if (strcmp(outDev, "tape")) { + } else if (strcmp(outDev, "tape") == 0) { Evt_writeTape(evt, outTape); } } -- 2.43.0