]> jspc29.x-matter.uni-frankfurt.de Git - daqdata.git/commitdiff
DAQ_SETUP fixed. Sergey.
authorhadaq <hadaq>
Fri, 16 Apr 2010 14:20:19 +0000 (14:20 +0000)
committerhadaq <hadaq>
Fri, 16 Apr 2010 14:20:19 +0000 (14:20 +0000)
hadaq/evtbuild.c

index 722686f937c142340ef81511dffe1217e6eea7af..daf9fc1ce70d8b982a5470f931502fdb04a89935 100644 (file)
@@ -1,4 +1,4 @@
-static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.102 2010-04-16 12:46:53 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/evtbuild.c,v 6.103 2010-04-16 14:20:19 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES
@@ -111,7 +111,6 @@ typedef struct TheArgsS {
        char shmname[PARAM_MAX_VALUE_LEN];
        unsigned int ebnum;
        char runinfo2ora[PARAM_MAX_VALUE_LEN];
-       char daq_setup[PARAM_MAX_VALUE_LEN];
 } TheArgs;
 
 typedef struct TheStatsS {
@@ -305,8 +304,6 @@ static void argsDefault(TheArgs *my)
        my->ebnum = 1;
        my->ignore = 0;
 
-       strcpy(my->daq_setup, getenv("DAQ_SETUP"));
-
        /* read path from DAQ_SETUP and define full file name */
        sprintf(my->runinfo2ora, "%s_runinfo2ora.txt", getenv("DAQ_SETUP"));
 }
@@ -762,7 +759,7 @@ unsigned long getRunId(TheArgs *my)
 
        while (my->epicsCtrl && myRunId == 0) {
                if (Worker_getStatistic("daq_evtbuild", "runId", &myRunId) == -1) {
-                       fprintf(stderr, "<E> evtbuild.c: getRunId: Worker_getStatistic: cannot get runId!");
+                       fprintf(stderr, "<E> evtbuild.c: getRunId: Worker_getStatistic: cannot get runId!\n");
                        sleep(1);
                } else {