From: muench Date: Mon, 16 Jun 2003 08:14:30 +0000 (+0000) Subject: BUGFIX X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=8f62b1ea4cede427f73089f9daa0c299ea7975eb;p=daqdata.git BUGFIX --- diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c index 666f09f..2a84433 100644 --- a/hadaq/hwshow.c +++ b/hadaq/hwshow.c @@ -1,4 +1,4 @@ -static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.34 2003-05-14 13:54:44 muench Exp $"; +static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.35 2003-06-16 08:14:30 muench Exp $"; #define SHIP_BLT @@ -88,7 +88,7 @@ Hardware *newHardware(const char *subsystem) my->lbma = malloc(sizeof(LBma)); if (0 > conLBma(my->lbma, 0, Hardware_maxSubEvtSize(my), 0x3b)) { syslog(LOG_ERR, "%s:%d:%s", __FILE__, __LINE__, strerror(errno)); - return -1; + return NULL; } my->buf = LBma_getPtrL(my->lbma, 0); #endif @@ -151,7 +151,6 @@ void Hardware_waitForTrigger(Hardware *my, void *subEvt) } #endif } while (nRequests); - } #ifdef SHIP_BLT @@ -224,7 +223,8 @@ void Hardware_readout(Hardware *my, void *partEvt) } else { if (trigTag != (SubEvt_trigNr(subEvt) & 0xff)) { dataError = 1; - syslog(LOG_ERR, "(%s)Trigger tag mismatch: 0x%08x (%d) != 0x%08x", + syslog(LOG_ERR, + "(%s)Trigger tag mismatch: 0x%08x (%d) != 0x%08x", my->ship[i]->name, trigTag, firstShip, SubEvt_trigNr(subEvt)); } }