BUGFIXES, first version running 'in principal'

diff --git a/allParam/rpc/pcache.c b/allParam/rpc/pcache.c
index 36ac7f4cdf6505c480c1c15af30e788e7b5ecf79..b684376c8ef1fb195ccf038183ca4a91351228e8 100644 (file)
--- a/allParam/rpc/pcache.c
+++ b/allParam/rpc/pcache.c
@@ -1,20 +1,34 @@
+#include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "pcache.h"
 
+int PData_invariant(const PData *my) {
+       int retVal;
+
+       retVal = my != NULL
+               && my->name != NULL
+               && my->idx != NULL
+               && (my->type == PInt || my->type == PString || my->type == PIntArray || my->type == PStringArray);
+       
+       return retVal;
+}
+
 PData *newPInt(const char *name, const char *idx, unsigned long int value) {
        PData *my = malloc(sizeof(PData));
 
-       my->name = malloc(strlen(name));
+       my->name = malloc(strlen(name)+1);
        strcpy(my->name, name);
 
-       my->idx = malloc(strlen(idx));
+       my->idx = malloc(strlen(idx)+1);
        strcpy(my->idx, idx);
 
        my->type = PInt;
        my->value.PInt = value;
 
+       assert(PData_invariant(my));
        return my;
 }
 
@@ -33,15 +47,20 @@ void delPData(PData *my) {
 static int keyCompare(const PData *my, const PData *data) {
        int retVal;
 
+       assert(PData_invariant(my));
+       assert(PData_invariant(data));
+
        retVal = strcmp(my->name, data->name);
        if (retVal == 0) {
                retVal = strcmp(my->idx, data->idx);
        }
 
-       return retVal;
+       return retVal < 0 ? -1 : retVal > 0 ? 1 : 0;
 }
 
 PCache *insert(PCache *my, PData *data) {
+       assert(PData_invariant(data));
+
        if (my == NULL) {
                my = malloc(sizeof(PCache));
                my->r = NULL;
@@ -67,6 +86,8 @@ PCache *insert(PCache *my, PData *data) {
 PData *find(const PCache *my, const PData *data) {
        PData *retVal;
 
+       assert(PData_invariant(data));
+
        if (my == NULL) {
                retVal = NULL;
        } else {
@@ -86,7 +107,10 @@ PData *find(const PCache *my, const PData *data) {
 }
 
 int PCache_storeInt(PCache **my, const char *name, const char *idx, unsigned long int value) {
+
        *my = insert(*my, newPInt(name, idx, value));                   
+
+       return 0;
 }
        
 int PCache_getInt(const PCache *my, const char *name, const char *idx, unsigned long int *value) {

diff --git a/allParam/rpc/rpcParam.c b/allParam/rpc/rpcParam.c
index c0dfbea47c3197a9cae12084fb490df7df1e3f76..109fff707c7c1cd3b597aee66cfdc07ab53a4077 100644 (file)
--- a/allParam/rpc/rpcParam.c
+++ b/allParam/rpc/rpcParam.c
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/rpc/rpcParam.c,v 1.7 2004-05-07 11:55:29 muench Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/rpc/rpcParam.c,v 1.8 2004-05-10 11:20:30 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -108,9 +108,8 @@ int Param_getInt(const Param * my, const char *name, const char *idx, int *row,
 
                retVal =  res.ret;
                PCache_storeInt(&rpcParam->cache, name, idx, *val);
-               puts("no cache");
        } else {
-               puts("cache");
+               *row = 1;
        }
        return retVal;
 }