*** empty log message ***

diff --git a/allParam/file/fileParam.c b/allParam/file/fileParam.c
index 139a5aa37f3c8c7da7e4b192d0a6529c7bc67d31..774c8d8ee2f81c29b0d9cb848b4836b7b25152b7 100644 (file)
--- a/allParam/file/fileParam.c
+++ b/allParam/file/fileParam.c
@@ -1,5 +1,11 @@
 #define _POSIX_C_SOURCE 199509L
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include <hadesstd.h>
+
 #include "param.h"
 
 #define BUFFERSIZE 130
@@ -7,13 +13,13 @@
 int conParam(Param *my)
 {
        int i = 0;
-       char fileName[PARAM_MAX_NAME_LEN];
+       char *fileName;
        FILE *f;
        char buf[BUFFERSIZE];
 
-       strcpy(fileName, fn);
+       fileName = getenv("DAQSLOW_PARAM_FILE");
        if (fileName == NULL) {
-               strcmp(fileName, "param.tcl");
+               strcpy(fileName, "param.tcl");
        }
        if (NULL == (f = fopen(fileName, "r"))) {
                msglog(LOG_ERR, "opening param file: %s\n", strerror(errno));
@@ -47,17 +53,13 @@ void desParam(Param *my)
 {
 }
 
-int Param_getParamNumber(const Param *my, const char *name, const char *idx, int num)
+int Param_getParamNumber(const Param *my, const char *name, const char *idx)
 {
        int retVal = -1;
        int i;
        char fullName[PARAM_MAX_NAME_LEN];
 
-       if (num == -1) {
-               sprintf(fullName, "%s(%s)", name, idx);
-       } else {
-               sprintf(fullName, "%s(%s%d)", name, idx, num);
-       }
+       sprintf(fullName, "%s(%s)", name, idx);
        for (i = 0; i < my->nVals; i++) {
                if (strcmp(my->pname[i], fullName) == 0) {
                        retVal = i;
@@ -66,7 +68,7 @@ int Param_getParamNumber(const Param *my, const char *name, const char *idx, int
        return retVal;
 }
 
-int Param_getInt(const Param *my, const char *name, const char *idx, int *val)
+int Param_getInt(const Param *my, const char *name, const char *idx, unsigned long int *val)
 {
        int status;
        char valstr[PARAM_MAX_VALUE_LEN];
@@ -85,24 +87,25 @@ int Param_getInt(const Param *my, const char *name, const char *idx, int *val)
 int Param_getString(const Param *my, const char *name, const char *idx, char *val)
 {
        int n;
-       n = Param_getParamNumber(name, index, num);
+       n = Param_getParamNumber(my, name, idx);
        if (n == -1) {
                msglog(LOG_WARNING, "Parameter %s(%s) not found, returning NULL-pointer.\n", name, idx);
                return 0;
        } else {
-               strcpy(val[i], my->value[n]);
+               strcpy(val, my->value[n]);
        }
        return 1;
 }
 
-int Param_getIntArray(const Param *my, const char *name, const char *idx, int num, int *val)
+int Param_getIntArray(const Param *my, const char *name, const char *idx, int num, unsigned long int *val)
 {
        int status;
        int tmp;
+       int i;
        char index[PARAM_MAX_NAME_LEN];
-       for (int i = 0 ; i < num ; i++) {
+       for (i = 0 ; i < num ; i++) {
                sprintf(index,"%s%d", idx, i);
-               if ((tmp = Param_getInt(my, name, index, val[i]) == 1) && (status >= 0)) {
+               if ((tmp = Param_getInt(my, name, index, val + i) == 1) && (status >= 0)) {
                        status++;
                } else {
                        status = tmp;
@@ -116,8 +119,9 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 {
        int status;
        int tmp;
+       int i;
        char index[PARAM_MAX_NAME_LEN];
-       for (int i = 0 ; i < num ; i++) {
+       for (i = 0 ; i < num ; i++) {
                sprintf(index,"%s%d", idx, i);
                if ((tmp = Param_getString(my, name, index, val[i]) == 1) && (status >= 0)) {
                        status++;

diff --git a/allParam/file/fileParam.h b/allParam/file/fileParam.h
index e6df724c2b6b0fc53c7a6369c522232acca4c7b4..d855094da634b1fa18b1cc0bc7bf6590d4078901 100644 (file)
--- a/allParam/file/fileParam.h
+++ b/allParam/file/fileParam.h
@@ -13,11 +13,9 @@ typedef struct ParamS {
        int overFullParamFile;
        char pname[PARAM_MAX_NVALS][PARAM_MAX_NAME_LEN];
        char value[PARAM_MAX_NVALS][PARAM_MAX_NAME_LEN];
-};
-
 } Param;
 
-int Param_getParamNumber(const Param *, const char *, const char *, int);
+int Param_getParamNumber(const Param *, const char *, const char *);
 
 /******************************************************************
  * Section containing the API for param (common to all param.h's) *