From: hades Date: Fri, 8 Sep 2000 07:56:10 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=a7c0987393828e1a2875eb837ab2cf8ac582583f;p=daqdata.git *** empty log message *** --- diff --git a/allParam/ca/caParam.h b/allParam/ca/caParam.h index 340d72b..4f8b1ff 100644 --- a/allParam/ca/caParam.h +++ b/allParam/ca/caParam.h @@ -5,11 +5,7 @@ * Section containing struct Param (different in the different param.h's) * **************************************************************************/ -#define PARAM_MAX_NVALS 1024 -#define PARAM_MAX_NAME_LEN 128 - #define TIMEOUT 0.5 -#define ECA_NORETVAL 106 typedef struct ParamS { char *strerror; @@ -68,7 +64,9 @@ void desParam(Param *); * */ +#define PARAM_MAX_NVALS 1024 #define PARAM_MAX_VALUE_LEN 128 +#define PARAM_MAX_NAME_LEN 128 int Param_getInt(const Param *, const char *, const char *, int *, unsigned long int *); int Param_getString(const Param *, const char *, const char *, int *, char *); diff --git a/allParam/file/fileParam.h b/allParam/file/fileParam.h index d738cc0..d503d39 100644 --- a/allParam/file/fileParam.h +++ b/allParam/file/fileParam.h @@ -5,9 +5,6 @@ * Section containing struct Param (different in the different param.h's) * **************************************************************************/ -#define PARAM_MAX_NAME_LEN 128 -#define PARAM_MAX_NVALS 1024 - typedef struct ParamS { char *strerror; int nVals; @@ -61,7 +58,9 @@ void desParam(Param *); * */ +#define PARAM_MAX_NVALS 1024 #define PARAM_MAX_VALUE_LEN 128 +#define PARAM_MAX_NAME_LEN 128 int Param_getInt(const Param *, const char *, const char *, int *, unsigned long int *); int Param_getString(const Param *, const char *, const char *, int *, char *); diff --git a/allParam/ora/oraParam.h b/allParam/ora/oraParam.h index 40e6db4..ef65659 100644 --- a/allParam/ora/oraParam.h +++ b/allParam/ora/oraParam.h @@ -5,9 +5,6 @@ * Section containing struct Param (different in the different param.h's) * **************************************************************************/ -#define PARAM_MAX_NAME_LEN 128 -#define PARAM_MAX_NVALS 1024 - typedef struct ParamS { const char *user; const char *passwd; @@ -59,7 +56,9 @@ void desParam(Param *); * */ +#define PARAM_MAX_NVALS 1024 #define PARAM_MAX_VALUE_LEN 128 +#define PARAM_MAX_NAME_LEN 128 int Param_getInt(const Param *, const char *, const char *, int *, unsigned long int *); int Param_getString(const Param *, const char *, const char *, int *, char *); diff --git a/allParam/psql/psqlParam.h b/allParam/psql/psqlParam.h index 924986b..060bd9f 100644 --- a/allParam/psql/psqlParam.h +++ b/allParam/psql/psqlParam.h @@ -7,7 +7,6 @@ #define PG_MAX_QUERY_LEN 1024 #define PG_MAX_CLAUSE_LEN 256 -#define PARAM_MAX_NAME_LEN PARAM_MAX_VALUE_LEN typedef struct ParamS { char *strerror; @@ -58,7 +57,9 @@ void desParam(Param *); * */ +#define PARAM_MAX_NVALS 1024 #define PARAM_MAX_VALUE_LEN 128 +#define PARAM_MAX_NAME_LEN 128 int Param_getInt(const Param *, const char *, const char *, int *, unsigned long int *); int Param_getString(const Param *, const char *, const char *, int *, char *); diff --git a/allParam/tcl/tclParam.h b/allParam/tcl/tclParam.h index 2e11006..fbb86d1 100644 --- a/allParam/tcl/tclParam.h +++ b/allParam/tcl/tclParam.h @@ -7,8 +7,6 @@ #include -#define PARAM_MAX_NAME_LEN 128 - typedef struct ParamS { char *strerror; Tcl_Interp *interp; @@ -59,7 +57,9 @@ void desParam(Param *); * */ +#define PARAM_MAX_NVALS 1024 #define PARAM_MAX_VALUE_LEN 128 +#define PARAM_MAX_NAME_LEN 128 int Param_getInt(const Param *, const char *, const char *, int *, unsigned long int *); int Param_getString(const Param *, const char *, const char *, int *, char *); diff --git a/allParam/test/Makefile b/allParam/test/Makefile index a19d897..61028e1 100644 --- a/allParam/test/Makefile +++ b/allParam/test/Makefile @@ -2,7 +2,7 @@ MV = mv # Channel Access test HOST_ARCH = Linux -EPICS_HOME = $(HOME)/hades/epics +#EPICS_HOME = $(HOME)/hades/epics EPICS_BASE = $(EPICS_HOME)/base CACFLAGS = -I$(HOME)/include/ca LOADCALIBES = -L$(HOME)/lib/$(SYSTYPE) -L$(EPICS_BASE)/lib/$(HOST_ARCH) \