From: hades <hades>
Date: Fri, 8 Sep 2000 17:54:38 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=49f6a7a0d15150e3dae4ac733845db608bceec18;p=daqdata.git

*** empty log message ***
---

diff --git a/allParam/ca/caParam.c b/allParam/ca/caParam.c
index a0721b1..450c864 100644
--- a/allParam/ca/caParam.c
+++ b/allParam/ca/caParam.c
@@ -3,13 +3,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include <cadef.h>
 
 #include "param.h"
 
 static void Param_copyToAllocMem(struct event_handler_args args);
-static void *Param_returnPVName(const char *, const char *, char *);
+static void Param_returnPVName(const char *, const char *, char *);
 static void Param_strerror(Param *, const char *);
 
 int conParam(Param *my)
@@ -47,7 +48,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 		for (i = 0 ; i < *rows ; i++) {
 			val[i] = strtoul(value[i], &endptr, 0);
 			if(*endptr != '\0') {
-				Param_strerror((Param *) my, "Value seems not to be integer.\n");
+				Param_strerror((Param *) my, "Value seems not to be integer.");
 				retVal = -1;
 			}
 		}
@@ -65,7 +66,6 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 int Param_getStringArray(const Param *my, const char *name, const char *idx, int maxrows, int *rows, char **val)
 {
 	int retVal = 0;
-	int i;
 	int status;
 	int found = 1;
 	chid chan;
@@ -139,27 +139,14 @@ static void Param_copyToAllocMem(struct event_handler_args args)
 	int i;
 	ParamResult *result = args.usr;
 	dbr_string_t *buffer = (dbr_string_t *) args.dbr;
-	(int *) result->rows;
-	(int) result->maxrows;
-	(char **) result->val;
-	(const Param*) result->my;
-	(int *) result->retVal;
 	
 	*(result->rows) = (args.count > result->maxrows) ?
 		result->maxrows :
 		args.count;
 	if(args.type == DBR_STRING && args.status == ECA_NORMAL) {
-#if 1
-		if(*(result->rows) == 1) {
-			strcpy(result->val[0], buffer);
-		} else {
-#endif
-			for(i = 0 ; i < *(result->rows) ; i++) {
-				strcpy((result->val)[i], buffer[i]);
-			}
-#if 1
+		for(i = 0 ; i < *(result->rows) ; i++) {
+			strcpy((result->val)[i], buffer[i]);
 		}
-#endif
 	} else {
 		Param_strerror((Param *) result->my, ca_message(args.status));
 		*(result->rows) = 0;
@@ -167,7 +154,7 @@ static void Param_copyToAllocMem(struct event_handler_args args)
 	}
 }
 
-static void *Param_returnPVName(const char *name, const char *idx, char *pPVName)
+static void Param_returnPVName(const char *name, const char *idx, char *pPVName)
 {
 	int i;
 
diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 9f2a7bc..3f1bd10 100644
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include <oraca.h>
@@ -9,7 +10,7 @@
 
 #include "param.h"
 
-static void Param_rollback(int *);
+static void Param_rollback();
 
 static void Param_strerror(const Param *, const char *);
 
@@ -42,7 +43,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 	char *endptr;
 
 	EXEC SQL WHENEVER SQLERROR DO Param_strerror(my, sqlca.sqlerrm.sqlerrmc);
-	EXEC SQL WHENEVER SQLERROR DO Param_rollback(&retVal);
+	EXEC SQL WHENEVER SQLERROR DO Param_rollback();
 
 	EXEC SQL BEGIN DECLARE SECTION;
 	const char* un;
@@ -74,7 +75,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 		value[i][j + 1] = '\0';
 		val[i] = strtoul(value[i], &endptr, NULL);
 		if(*endptr != '\0') {
-			Param_strerror(my, "Value seems to be no integer.\n");
+			Param_strerror(my, "Value seems to be no integer.");
 			*rows = 0;
 			return -1;
 		}
@@ -93,7 +94,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 	int i;
 
 	EXEC SQL WHENEVER SQLERROR DO Param_strerror(my, sqlca.sqlerrm.sqlerrmc);
-	EXEC SQL WHENEVER SQLERROR DO Param_rollback(&retVal);
+	EXEC SQL WHENEVER SQLERROR DO Param_rollback();
 
 	EXEC SQL BEGIN DECLARE SECTION;
 	const char* un;
@@ -148,8 +149,7 @@ static void Param_strerror(const Param *my, const char *strerror)
 	}
 }
 
-static void Param_rollback(int *retVal) {
-	*retVal = -1;
+static void Param_rollback() {
 	EXEC SQL ROLLBACK RELEASE;
 }
 
diff --git a/allParam/psql/psqlParam.c b/allParam/psql/psqlParam.c
index 5ca270b..fe21909 100644
--- a/allParam/psql/psqlParam.c
+++ b/allParam/psql/psqlParam.c
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include <libpq-fe.h>
@@ -56,7 +57,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 
 	result = PQexec(conn, query);
 	if(PQresultStatus(result) != PGRES_TUPLES_OK) {
-		Param_strerror((Param *) my, "The PostgreSQL query result is not correct.\n");
+		Param_strerror((Param *) my, "The PostgreSQL query result is not correct.");
 		return -1;
 	}
 	fnum = PQfnumber(result, "value");
@@ -67,7 +68,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 	for (i = 0 ; i < *rows ; i++) {
 		val[i] = strtoul(PQgetvalue(result, i, fnum), &endptr, 0);
 		if(*endptr != '\0') {
-			Param_strerror((Param *) my, "Value seems to be no integer.\n");
+			Param_strerror((Param *) my, "Value seems to be no integer.");
 			*rows = 0;
 			return -1;
 		}
@@ -105,7 +106,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 
 	result = PQexec(conn, query);
 	if(PQresultStatus(result) != PGRES_TUPLES_OK) {
-		Param_strerror((Param *) my, "The PostgreSQL query result is not correct.\n");
+		Param_strerror((Param *) my, "The PostgreSQL query result is not correct.");
 		return -1;
 	}
 	fnum = PQfnumber(result, "value");
diff --git a/allParam/tcl/tclParam.c b/allParam/tcl/tclParam.c
index 46c3e03..69fae6c 100644
--- a/allParam/tcl/tclParam.c
+++ b/allParam/tcl/tclParam.c
@@ -3,8 +3,8 @@
 #include <unistd.h>
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include "param.h"
@@ -83,7 +83,6 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 {
 	int retVal = 0;
 	int i;
-	int row;
 	char lname[PARAM_MAX_NAME_LEN];
 	char lidx[PARAM_MAX_NAME_LEN];