From: hadaq <hadaq>
Date: Wed, 4 Jun 2008 16:12:06 +0000 (+0000)
Subject: minor change. Sergey Yurevich
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7c4c1564c1e854a7d48aa1208ed7fe463b2b92d9;p=daqdata.git

minor change. Sergey Yurevich
---

diff --git a/hadaq/evtbuild.c b/hadaq/evtbuild.c
index eb38ee8..508f7b0 100644
--- a/hadaq/evtbuild.c
+++ b/hadaq/evtbuild.c
@@ -1,5 +1,5 @@
 static char *rcsId =
-  "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.86 2008-06-03 16:31:26 hadaq Exp $";
+  "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.87 2008-06-04 16:12:06 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -182,11 +182,11 @@ static void usage (const char *progName)
   syslog (LOG_ERR, "Usage: [-m nrOfMsgs] [-f slowCtrlFile ...]");
   syslog (LOG_ERR, "Usage: [-o outPath] [-d null|tape|file|stdout]");
   syslog (LOG_ERR, "Usage: [-q queueSize] [-r runNumber]");
-  syslog (LOG_ERR, "Usage: [--shmname shmem_name] extention of shared memory name to be opened");
+  syslog (LOG_ERR, "Usage: [--shmname shmem_name] extension of shared memory name to be opened");
   syslog (LOG_ERR, "Usage: [-a (agent)] [-p priority] [-I evtId]");
   syslog (LOG_ERR, "Usage: [-v debug|info|notice|warning|err|alert|crit|emerg]");
   syslog (LOG_ERR, "Usage: [--norpc]");
-  syslog (LOG_ERR, "Usage: [--filesize maximum_size_of_output_file[in MB]]");
+  syslog (LOG_ERR, "Usage: [--filesize max_size] maximum size of output file in MB");
   syslog (LOG_ERR, "Usage: [--resdownscale downscale_factor] downscale factor for the res events");
   syslog (LOG_ERR, "Usage: [--resnumevents evt_num] maximum number of events in a resfile");
   syslog (LOG_ERR, "Usage: [--respath path] path for the res directory");
@@ -262,7 +262,7 @@ static void argsDefault (TheArgs * my)
   my->queueSize = 4 * 1024 * 1024UL;
   strcpy (my->verbosity, "info");
   my->evtId = 0;
-  my->maxFileSz = (2 * 1024 * 1024 * 1024UL - 1);
+  my->maxFileSz = (1.5 * 1024 * 1024 * 1024UL - 1);
   my->no_rpc = 0;
   my->write_data = 0;
   my->resdownscale = 0;
@@ -348,8 +348,8 @@ static int argsFromCL (TheArgs * my, int argc, char *argv[])
 	case 't':		            /* norpc - no arg */
 	  my->no_rpc = 1;
 	  break;
-	case 'z':		            /* filesize - one arg */
-	  my->maxFileSz = (1024 * 1024UL * strtoul (optarg, NULL, 0));
+	case 'z':		            /* from MBytes to Bytes */
+	  my->maxFileSz = (1024 * 1024UL * strtoul( optarg, NULL, 0 ));
 	  break;
 	case 'e':                           /* need resnumevents & respath */
 	  my->resdownscale = strtoul (optarg, NULL, 0);
@@ -416,7 +416,7 @@ static int argsCheck( TheArgs *my )
 
   /* check my->maxFileSz */
   if( (strcmp(my->outDev, "null") != 0) && (my->maxFileSz <= 0 || my->maxFileSz >= 1024 * 1024UL * 2000) ) {
-    fprintf( stderr, "<E> evtbuild.c, argsCheck(): --filesize must be >0 and <20000\n");
+    fprintf( stderr, "<E> evtbuild.c, argsCheck(): --filesize must be >0MB and <2000MB\n");
     return 1;
   }
 
diff --git a/hadaq/netmem.c b/hadaq/netmem.c
index 46dbd42..303f9e0 100644
--- a/hadaq/netmem.c
+++ b/hadaq/netmem.c
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.33 2008-06-03 16:31:56 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.34 2008-06-04 16:12:06 hadaq Exp $";
 
 
 #define _POSIX_C_SOURCE 199309L
@@ -54,7 +54,7 @@ static void usage(const char *progName)
 {
 	syslog(LOG_ERR, "Usage: %s -i inPath [-i inPath] -m nrOfMsgs [-p priority]", progName);
 	syslog( LOG_ERR, "[-b] show fill levels of buffers]" );
-	syslog( LOG_ERR, "[-S shmem_name] extention of a shared memory name to be used" );
+	syslog( LOG_ERR, "[-S shmem_name] extension of a shared memory name to be used" );
 }
 
 static void argsDump(TheArgs *my)