From: hadaq <hadaq>
Date: Sun, 27 Oct 2002 09:11:14 +0000 (+0000)
Subject: Aesthetics -- mm
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=626195c4eeb298e70e0f46d59de7adfe42af7b7f;p=daqdata.git

Aesthetics -- mm
---

diff --git a/hadaq/hwrich.c b/hadaq/hwrich.c
index dd2eed1..b124bce 100644
--- a/hadaq/hwrich.c
+++ b/hadaq/hwrich.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.32 2002-10-25 09:27:20 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwrich.c,v 6.33 2002-10-27 09:11:14 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -64,10 +64,10 @@ Hardware *newHardware(const char *subsystem)
 	}
 	my = malloc(sizeof(Hardware));
 	my->race = malloc(nCards * sizeof(HwRace *));
-
-	my->maxSubEvtSize = SubEvt_hdrSize() + (nCards * 2500 * sizeof(uint32_t));
 	my->nRaces = nCards;
 
+	my->maxSubEvtSize = SubEvt_hdrSize() + (my->nRaces * 2500 * sizeof(uint32_t));
+
 	for (i = 0; i < my->nRaces; i++) {
 		my->race[i] = malloc(sizeof(HwRace));
 		if (0 > conHwRace(my->race[i], cards[i], param)) {
diff --git a/hadaq/hwshow.c b/hadaq/hwshow.c
index 8bcae97..677bc0c 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.29 2002-10-27 08:53:27 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/Attic/hwshow.c,v 6.30 2002-10-27 09:11:14 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #include <unistd.h>
@@ -64,12 +64,12 @@ Hardware *newHardware(const char *subsystem)
 	}
 	my = malloc(sizeof(Hardware));
 	my->ship = malloc(nCards * sizeof(HwShip *));
+	my->nShips = nCards;
 
 #if 0
-	my->maxSubEvtSize = SubEvt_hdrSize() + (nCards * 1600 * sizeof(uint32_t));
+	my->maxSubEvtSize = SubEvt_hdrSize() + (my->nShips * 1600 * sizeof(uint32_t));
 #endif
-	my->maxSubEvtSize = SubEvt_hdrSize() + (nCards * 1900 * sizeof(uint32_t));
-	my->nShips = nCards;
+	my->maxSubEvtSize = SubEvt_hdrSize() + (my->nShips * 1900 * sizeof(uint32_t));
 
 	for (i = 0; i < my->nShips; i++) {
 		my->ship[i] = malloc(sizeof(HwShip));